Boost 1.43

.gitignore

@@ -28,7 +28,6 @@ linden/indra/newview/character/
 linden/indra/newview/app_settings/*.db2
 linden/indra/newview/app_settings/windlight/
 linden/indra/newview/cursors_mac/
-linden/indra/newview/viewer.icns
 linden/indra/newview/installers/windows/README.txt
 linden/indra/newview/installers/windows/*
 linden/indra/newview/res/imp_icon.ico #no.

linden/indra/cmake/Boost.cmake

@@ -14,7 +14,7 @@ else (STANDALONE)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 
   if (WINDOWS)
-    set(BOOST_VERSION 1_36)
+    set(BOOST_VERSION 1_43)
     if (MSVC80)
       set(BOOST_PROGRAM_OPTIONS_LIBRARY 
           optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
@@ -37,9 +37,16 @@ else (STANDALONE)
           debug libboost_signals-vc90-mt-gd-${BOOST_VERSION})
     endif (MSVC80)
   elseif (DARWIN)
-    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
-    set(BOOST_REGEX_LIBRARY boost_regex-mt)
-    set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
+  	set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options)
+  	set(BOOST_REGEX_LIBRARY boost_regex)
+  	set(BOOST_PYTHON_LIBRARY boost_python)
+  	set(BOOST_SIGNALS_LIBRARY boost_signals)
+  	set(BOOST_WAVE_LIBRARY boost_wave)
+  	set(BOOST_SYSTEM_LIBRARY boost_system)
+  	set(BOOST_FILESYSTEM_LIBRARY boost_filesystem)
+  	set(BOOST_IOSTREAMS_LIBRARY boost_iostreams)
+  	set(BOOST_DATE_TIME_LIBRARY boost_date_time)
+  	set(BOOST_THREAD_LIBRARY boost_thread)
   elseif (LINUX)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
     set(BOOST_REGEX_LIBRARY boost_regex-mt)

linden/indra/cmake/CopyWinLibs.cmake

@@ -255,7 +255,7 @@ set(all_targets ${all_targets} ${out_targets})
 # *TODO - Adapt this to support VC9
 FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
     PATHS
-     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
+     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
     NO_DEFAULT_PATH
     NO_DEFAULT_PATH
     )
@@ -285,14 +285,14 @@ if(EXISTS ${debug_msvc8_redist_path})
           ${CMAKE_CURRENT_SOURCE_DIR}/ImprudenceDebug.exe.config
           ${debug_appconfig_file}
         DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
-        COMMENT "Creating debug app config file"
+        COMMENT "Creating debug app config file ${debug_appconfig_file}"
         )
 
 endif (EXISTS ${debug_msvc8_redist_path})
 
 FIND_PATH(release_msvc8_redist_path msvcr80.dll
     PATHS
-     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
+     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
     NO_DEFAULT_PATH
     NO_DEFAULT_PATH
     )

linden/indra/develop.py

@@ -490,8 +490,15 @@ def _get_generator(self):
                     print 'Building with ', self.gens[version]['gen']
                     break
             else:
-                print >> sys.stderr, 'Cannot find a Visual Studio installation!'
-                sys.exit(1)
+                print >> sys.stderr, 'Cannot find a Visual Studio installation, testing for express editions'
+                for version in 'vc80 vc90 vc100 vc71'.split():
+                    if self.find_visual_studio_express(version):
+                        self._generator = version
+                        print 'Building with ', self.gens[version]['gen'] , "Express edition"
+                        break
+                else:
+                    print >> sys.stderr, 'Cannot find any Visual Studio installation'
+                    eys.exit(1)
         return self._generator
 
     def _set_generator(self, gen):
@@ -530,6 +537,28 @@ def get_HKLM_registry_value(self, key_str, value_str):
         value = _winreg.QueryValueEx(key, value_str)[0]
         print 'Found: %s' % value
         return value
+
+    def find_visual_studio_express(self, gen=None):
+        if gen is None:
+            gen = self._generator
+        gen = gen.lower()
+        try:
+            import _winreg
+            key_str = (r'SOFTWARE\Microsoft\VCExpress\%s\Setup\VC' %
+                       self.gens[gen]['ver'])
+            value_str = (r'ProductDir')
+            print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' %
+                   (key_str, value_str))
+            print key_str
+
+            reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
+            key = _winreg.OpenKey(reg, key_str)
+            value = _winreg.QueryValueEx(key, value_str)[0]+"IDE"
+            print 'Found: %s' % value
+            return value
+        except WindowsError, err:
+            print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
+            return ''
 
     def find_visual_studio(self, gen=None):
         if gen is None:
@@ -564,7 +593,10 @@ def get_build_cmd(self):
             return (executable, cmd)
 
         # devenv.com is CLI friendly, devenv.exe... not so much.
-        executable = '%sdevenv.com' % (self.find_visual_studio(),)
+        environment = self.find_visual_studio()
+        if environment == '':
+            environment = self.find_visual_studio_express()
+        executable = '%sdevenv.com' % (environment,)
         cmd = ('"%s" %s.sln /build %s' % 
                 (executable, self.project_name, self.build_type))
         return (executable, cmd)

linden/indra/llinventory/llparcel.h

@@ -67,6 +67,7 @@ const F32 PARCEL_PASS_HOURS_DEFAULT = 1.f;
 
 // Number of "chunks" in which parcel overlay data is sent
 // Chunk 0 = southern rows, entire width
+// NOTE: NOT USABLE FOR VAR SIZED REGIONS!
 const S32 PARCEL_OVERLAY_CHUNKS = 4;
 
 // Bottom three bits are a color index for the land overlay

linden/indra/llmessage/message_prehash.cpp

@@ -587,6 +587,8 @@ char* _PREHASH_LastName = LLMessageStringTable::getInstance()->getString("LastNa
 char* _PREHASH_From = LLMessageStringTable::getInstance()->getString("From");
 char* _PREHASH_RoleChange = LLMessageStringTable::getInstance()->getString("RoleChange");
 char* _PREHASH_Port = LLMessageStringTable::getInstance()->getString("Port");
+char* _PREHASH_RegionSizeX = LLMessageStringTable::getInstance()->getString("RegionSizeX");
+char* _PREHASH_RegionSizeY = LLMessageStringTable::getInstance()->getString("RegionSizeY");
 char* _PREHASH_MemberTitle = LLMessageStringTable::getInstance()->getString("MemberTitle");
 char* _PREHASH_LogParcelChanges = LLMessageStringTable::getInstance()->getString("LogParcelChanges");
 char* _PREHASH_AgentCachedTextureResponse = LLMessageStringTable::getInstance()->getString("AgentCachedTextureResponse");

linden/indra/llmessage/message_prehash.h

@@ -587,6 +587,8 @@ extern char * _PREHASH_LastName;
 extern char * _PREHASH_From;
 extern char * _PREHASH_RoleChange;
 extern char * _PREHASH_Port;
+extern char * _PREHASH_RegionSizeX;
+extern char * _PREHASH_RegionSizeY;
 extern char * _PREHASH_MemberTitle;
 extern char * _PREHASH_LogParcelChanges;
 extern char * _PREHASH_AgentCachedTextureResponse;

linden/indra/newview/CMakeLists.txt

@@ -1472,16 +1472,16 @@ if (LINUX)
 endif (LINUX)
 
 if (DARWIN)
-  set(product "Imprudence")
+  set(product "Astra Viewer")
   set_target_properties(
     ${VIEWER_BINARY_NAME}
     PROPERTIES
     OUTPUT_NAME "${product}"
     MACOSX_BUNDLE_INFO_STRING "info string - localize me"
     MACOSX_BUNDLE_ICON_FILE "viewer.icns"
-    MACOSX_BUNDLE_GUI_IDENTIFIER "Imprudence"
+    MACOSX_BUNDLE_GUI_IDENTIFIER "Astra Viewer"
     MACOSX_BUNDLE_LONG_VERSION_STRING "ververver"
-    MACOSX_BUNDLE_BUNDLE_NAME "Imprudence"
+    MACOSX_BUNDLE_BUNDLE_NAME "Astra Viewer"
     MACOSX_BUNDLE_SHORT_VERSION_STRING "asdf"
     MACOSX_BUNDLE_BUNDLE_VERSION "asdf"
     MACOSX_BUNDLE_COPYRIGHT "copyright linden lab 2007 - localize me and run me through a legal wringer"

linden/indra/newview/app_settings/default_grids.xml

@@ -9,8 +9,8 @@
       <key>gridnick</key><string>AstraGrid</string>
       <key>gridname</key><string>AstraGrid</string>
       <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://login.astragrid.com:8003/</string>
-      <key>loginpage</key><string>http://astragrid.com/loginscreen.php</string>
+      <key>loginuri</key><string>http://login.astragrid.com:8002/</string>
+      <key>loginpage</key><string>http://astragrid.com/loginscreen/</string>
       <key>helperuri</key><string>http://astragrid.com/index.php?page=help</string>
       <key>website</key><string>http://astragrid.com/</string>
       <key>support</key><string>http://astragrid.com/index.php?page=support</string>
@@ -21,7 +21,7 @@
 
     <!-- Second Life -->
     <map>
-      <key>gridnick</key><string>secondlife</string>
+      <key>gridnick</key><string>SecondLife</string>
       <key>gridname</key><string>Second Life</string>
       <key>platform</key><string>SecondLife</string>
       <key>loginuri</key><string>https://login.agni.lindenlab.com/cgi-bin/login.cgi</string>
@@ -150,6 +150,7 @@
       <key>version</key>   <string>0</string>
     </map>
 
+    <!-- AuroraGrid -->
     <map>
         <key>gridname</key>
             <string>AuroraGrid</string>

linden/indra/newview/app_settings/settings.xml

@@ -1397,7 +1397,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>1</integer>
+    <integer>0</integer>
   </map>
   <key>WarnFirstVoiceLicense</key>
   <map>
@@ -1408,7 +1408,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>1</integer>
+    <integer>0</integer>
   </map>
   <key>WornItemsSortOrder</key>
   <map>
@@ -10677,7 +10677,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>ShowChatHistory</key>
     <map>
@@ -11054,7 +11054,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>ShowMovementControls</key>
     <map>
@@ -11065,7 +11065,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>ShowNearClip</key>
     <map>

linden/indra/newview/exporttracker.cpp

@@ -1480,7 +1480,7 @@ void JCExportTracker::doexportworker(void *userdata)
 {
 	//CHECK IF WE'RE DONE
 	if(ExportTrackerFloater::mObjectSelection.empty() && ExportTrackerFloater::mObjectSelectionWaitList.empty()
-		&& (requested_inventory.empty() ||gSavedSettings.getBOOL("ExporterInventoryLater"))
+		&& (requested_inventory.empty())// ||gSavedSettings.getBOOL("ExporterInventoryLater"))
 		&& requested_properties.empty() && expected_surrogate_pos.empty())
 	{
 		gIdleCallbacks.deleteFunction(JCExportTracker::exportworker);
@@ -1707,7 +1707,7 @@ void JCExportTracker::doexportworker(void *userdata)
 		//Find an object that has completed export
 
 		if(((export_properties==FALSE) || (*iter)->mPropertiesRecieved) && 
-			( ((export_inventory==FALSE) || (*iter)->mInventoryRecieved))|| gSavedSettings.getBOOL("ExporterInventoryLater") )
+			( ((export_inventory==FALSE) || (*iter)->mInventoryRecieved)))//|| gSavedSettings.getBOOL("ExporterInventoryLater") )
 		{
 			//we have the root properties and inventory now check all children
 			bool got_all_stuff=true;
@@ -2472,7 +2472,8 @@ void JCExportTracker::actuallyprocessObjectProperties(LLMessageSystem* msg)
 			{
 				free(req);
 				requested_properties.erase(iter);
-				mPropertiesReceived++;
+				if(mStatus == EXPORTING)
+					mPropertiesReceived++;
 				break;
 			}
 		}

linden/indra/newview/floaterao.cpp

@@ -119,6 +119,9 @@ AOInvTimer::AOInvTimer() : LLEventTimer( (F32)1.0 )
 AOInvTimer::~AOInvTimer()
 {
 }
+
+BOOL AOInvTimer::fullfetch = FALSE;
+
 BOOL AOInvTimer::tick()
 {
 	if (!(gSavedSettings.getBOOL("AOEnabled"))) return TRUE;
@@ -129,6 +132,15 @@ BOOL AOInvTimer::tick()
 //			cmdline_printchat("Inventory fetched, loading AO.");
 			LLFloaterAO::init();
 			return TRUE;
+		}else
+		{
+			//static BOOL startedfetch = FALSE;
+			if(fullfetch == FALSE)
+			{
+				fullfetch = TRUE;
+				//no choice, can't move the AO till we find it, should only have to happen once
+				gInventory.startBackgroundFetch();
+			}
 		}
 	}
 	return FALSE;

linden/indra/newview/floaterao.h

@@ -51,6 +51,7 @@ class AOStandTimer : public LLEventTimer
 class AOInvTimer : public LLEventTimer
 {
 public:
+	static BOOL fullfetch;
 	AOInvTimer();
 	~AOInvTimer();
 	BOOL tick();