Second Life viewer sources 1.20.2

27 files changed, 267 insertions, 211 deletions

diff --git a/linden/indra/llcommon/imageids.h b/linden/indra/llcommon/imageids.h
index 4a1e221..9361479 100644
--- a/linden/indra/llcommon/imageids.h
+++ b/linden/indra/llcommon/imageids.h
@@ -43,60 +43,34 @@
                                                                                                                                                         // pre-cached on viewer
 
 // Grass Images
-//const LLUUID IMG_GRASS1                       ("990c4086-46ce-49bd-8cae-afcc23a08f4e"); // dataserver
-//const LLUUID IMG_GRASS2                       ("869e2dcf-21b9-402d-a36d-9a23365cf723"); // dataserver
-//const LLUUID IMG_GRASS3                       ("8f97e7a7-f664-4967-9e8f-8d9e8039c1b7"); // dataserver
-
-//const LLUUID IMG_GRASS4                       ("8a05131d-35b7-4812-bcfc-a989b0f954ef"); // dataserver
-
-//const LLUUID IMG_GRASS5                       ("7d092acb-c69a-4122-b09b-f285e009b185"); // dataserver
-
-const LLUUID IMG_CLEAR                  ("11ee27f5-43c0-414e-afd5-d7f5688c351f");  // VIEWER
 const LLUUID IMG_SMOKE                  ("b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d");  // VIEWER
 
 const LLUUID IMG_DEFAULT                ("d2114404-dd59-4a4d-8e6c-49359e91bbf0");  // VIEWER
 
-//const LLUUID IMG_SAND                 ("0ff70ead-4562-45f9-9e8a-52b1a3286868"); // VIEWER 1.5k
-//const LLUUID IMG_GRASS                        ("5ab48dd5-05d0-4f1a-ace6-efd4e2fb3508"); // VIEWER 1.2k
-//const LLUUID IMG_ROCK                 ("402f8b24-5f9d-4905-b5f8-37baff603e88"); // VIEWER 1.2k
-//const LLUUID IMG_ROCKFACE             ("9c88539c-fd04-46b8-bea2-ddf1bcffe3bd"); // VIEWER 1.2k
 const LLUUID IMG_SUN                    ("cce0f112-878f-4586-a2e2-a8f104bba271"); // dataserver
 const LLUUID IMG_MOON                   ("d07f6eed-b96a-47cd-b51d-400ad4a1c428"); // dataserver
 const LLUUID IMG_CLOUD_POOF             ("fc4b9f0b-d008-45c6-96a4-01dd947ac621"); // dataserver
 const LLUUID IMG_SHOT                   ("35f217a3-f618-49cf-bbca-c86d486551a9"); // dataserver
 const LLUUID IMG_SPARK                  ("d2e75ac1-d0fb-4532-820e-a20034ac814d"); // dataserver
 const LLUUID IMG_FIRE                   ("aca40aa8-44cf-44ca-a0fa-93e1a2986f82"); // dataserver
-//const LLUUID IMG_WATER                        ("e510b068-d20d-4612-a08d-fde4d5c15789"); // VIEWER
 const LLUUID IMG_FACE_SELECT    ("a85ac674-cb75-4af6-9499-df7c5aaf7a28"); // face selector
-
-//const LLUUID IMG_SHADOW                       ("5e1de0a8-f9f8-4237-9396-d221126a7c4a"); // dataserver
-//const LLUUID IMG_AVATARSHADOW ("c7d8bbf3-21ee-4f6e-9b20-3cf18425af1d"); // dataserver
-//const LLUUID IMG_BOXSHADOW            ("8d86b8cc-4889-408a-8b72-c1961bae53d7"); // dataserver
-//const LLUUID IMG_EYE                  ("5e3551ae-9971-4814-af99-5117591e937b"); // dataserver
-//const LLUUID IMG_BLUE_FLAME           ("d8b62059-7b31-4511-a479-1fe45117948f"); // dataserver
-
 const LLUUID IMG_DEFAULT_AVATAR ("c228d1cf-4b5d-4ba8-84f4-899a0796aa97"); // dataserver
-//const LLUUID IMG_ENERGY_BEAM  ("09e7bc54-11b9-442a-ae3d-f52e599e466a"); // dataserver
-//const LLUUID IMG_ENERGY_BEAM2 ("de651394-f926-48db-b666-e49d83af1bbc"); // dataserver
-
-//const LLUUID IMG_BRICK_PATH           ("a9d0019b-3783-4c7f-959c-322d301918bc"); // dataserver
 
 const LLUUID IMG_EXPLOSION                              ("68edcf47-ccd7-45b8-9f90-1649d7f12806"); // On dataserver
 const LLUUID IMG_EXPLOSION_2                    ("21ce046c-83fe-430a-b629-c7660ac78d7c"); // On dataserver
 const LLUUID IMG_EXPLOSION_3                    ("fedea30a-1be8-47a6-bc06-337a04a39c4b"); // On dataserver
 const LLUUID IMG_EXPLOSION_4                    ("abf0d56b-82e5-47a2-a8ad-74741bb2c29e"); // On dataserver
-//const LLUUID IMG_EXPLOSION_5                  ("60f2dec7-675b-4950-b614-85b907d552ea"); // On dataserver
-//const LLUUID IMG_SPLASH_SPRITE                        ("8a101f63-fe45-49e7-9f8a-e64817daa475"); // On dataserver
 const LLUUID IMG_SMOKE_POOF                             ("1e63e323-5fe0-452e-92f8-b98bd0f764e3"); // On dataserver
 
 const LLUUID IMG_BIG_EXPLOSION_1                ("5e47a0dc-97bf-44e0-8b40-de06718cee9d"); // On dataserver
 const LLUUID IMG_BIG_EXPLOSION_2                ("9c8eca51-53d5-42a7-bb58-cef070395db8"); // On dataserver
-//const LLUUID IMG_BLUE_BLOOD                           ("8bc2e3f8-097e-4c87-b417-b0d699d07189"); // On dataserver
 
-const LLUUID IMG_BLOOM1                             ("3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef");
-//const LLUUID IMG_BLOOM2                                   ("9fb76e81-eca0-4b6a-96e1-a6c5a685150b");
-//const LLUUID IMG_BLOOM3                                   ("fb1fecba-9585-415b-ad15-6e6e3d6c5479");
+const LLUUID IMG_BLOOM1                             ("3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef"); // VIEWER
+const LLUUID TERRAIN_DIRT_DETAIL                ("0bc58228-74a0-7e83-89bc-5c23464bcec5"); // VIEWER
+const LLUUID TERRAIN_GRASS_DETAIL               ("63338ede-0037-c4fd-855b-015d77112fc8"); // VIEWER
+const LLUUID TERRAIN_MOUNTAIN_DETAIL    ("303cd381-8560-7579-23f1-f0a880799740"); // VIEWER
+const LLUUID TERRAIN_ROCK_DETAIL                ("53a2f406-4895-1d13-d541-d2e3b86bc19c"); // VIEWER
 
-const LLUUID IMG_PTT_SPEAKER            ("89e9fc7c-0b16-457d-be4f-136270759c4d"); // On cache
+const LLUUID DEFAULT_WATER_NORMAL               ("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); // VIEWER
 
 #endif
diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index eceb576..77f3d8c 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -38,9 +38,10 @@
 // At 45 Hz collisions seem stable and objects seem
 // to settle down at a reasonable rate.
 // JC 3/18/2003
-const F32 HAVOK_TIMESTEP = 1.f / 45.f;
+const F32 PHYSICS_TIMESTEP = 1.f / 45.f;
 
 const F32 COLLISION_TOLERANCE = 0.1f;
+const F32 HALF_COLLISION_TOLERANCE = COLLISION_TOLERANCE * 0.5f;
 
 // Time constants
 const U32 HOURS_PER_LINDEN_DAY          = 4;    
@@ -53,6 +54,8 @@ const F32 REGION_WIDTH_METERS = 256.f;
 const S32 REGION_WIDTH_UNITS = 256;
 const U32 REGION_WIDTH_U32 = 256;
 
+const F32 REGION_HEIGHT_METERS = 4096.f;
+
 // Bits for simulator performance query flags
 enum LAND_STAT_FLAGS
 {
@@ -87,7 +90,7 @@ const 	F32 	MAX_AGENT_HEIGHT		= 2.65f - 2.0f * COLLISION_TOLERANCE;
 
 // For linked sets
 const S32 MAX_CHILDREN_PER_TASK = 255;
-const S32 MAX_CHILDREN_PER_PHYSICAL_TASK = 31;
+const S32 MAX_CHILDREN_PER_PHYSICAL_TASK = 32;
 
 const S32 MAX_JOINTS_PER_OBJECT = 1;    // limiting to 1 until Havok 2.x
 
@@ -339,7 +342,7 @@ const U32 MAP_ITEM_LAND_FOR_SALE = 0x07;
 const U32 MAP_ITEM_CLASSIFIED = 0x08;
 
 // Crash reporter behavior
-const char* const CRASH_SETTINGS_FILE = "crash_settings.xml";
+const char* const CRASH_SETTINGS_FILE = "settings_crash_behavior.xml";
 const char* const CRASH_BEHAVIOR_SETTING = "CrashSubmitBehavior";
 const S32 CRASH_BEHAVIOR_ASK = 0;
 const S32 CRASH_BEHAVIOR_ALWAYS_SEND = 1;
diff --git a/linden/indra/llcommon/llagentconstants.h b/linden/indra/llcommon/llagentconstants.h
index 5757751..48c097a 100644
--- a/linden/indra/llcommon/llagentconstants.h
+++ b/linden/indra/llcommon/llagentconstants.h
@@ -67,43 +67,43 @@ const U32 CONTROL_ML_LBUTTON_DOWN_INDEX		= 30;
 const U32 CONTROL_ML_LBUTTON_UP_INDEX           = 31;
 const U32 TOTAL_CONTROLS                                        = 32;
 
-const U32 AGENT_CONTROL_AT_POS              = 0x1 << CONTROL_AT_POS_INDEX;
-const U32 AGENT_CONTROL_AT_NEG              = 0x1 << CONTROL_AT_NEG_INDEX;
-const U32 AGENT_CONTROL_LEFT_POS            = 0x1 << CONTROL_LEFT_POS_INDEX;
-const U32 AGENT_CONTROL_LEFT_NEG            = 0x1 << CONTROL_LEFT_NEG_INDEX;
-const U32 AGENT_CONTROL_UP_POS              = 0x1 << CONTROL_UP_POS_INDEX;
-const U32 AGENT_CONTROL_UP_NEG              = 0x1 << CONTROL_UP_NEG_INDEX;
-const U32 AGENT_CONTROL_PITCH_POS           = 0x1 << CONTROL_PITCH_POS_INDEX;
-const U32 AGENT_CONTROL_PITCH_NEG           = 0x1 << CONTROL_PITCH_NEG_INDEX;
-const U32 AGENT_CONTROL_YAW_POS             = 0x1 << CONTROL_YAW_POS_INDEX;
-const U32 AGENT_CONTROL_YAW_NEG             = 0x1 << CONTROL_YAW_NEG_INDEX;
-
-const U32 AGENT_CONTROL_FAST_AT             = 0x1 << CONTROL_FAST_AT_INDEX;
-const U32 AGENT_CONTROL_FAST_LEFT           = 0x1 << CONTROL_FAST_LEFT_INDEX;
-const U32 AGENT_CONTROL_FAST_UP             = 0x1 << CONTROL_FAST_UP_INDEX;
-
-const U32 AGENT_CONTROL_FLY                                     = 0x1 << CONTROL_FLY_INDEX;
-const U32 AGENT_CONTROL_STOP                            = 0x1 << CONTROL_STOP_INDEX;
-const U32 AGENT_CONTROL_FINISH_ANIM                     = 0x1 << CONTROL_FINISH_ANIM_INDEX;
-const U32 AGENT_CONTROL_STAND_UP                        = 0x1 << CONTROL_STAND_UP_INDEX;
-const U32 AGENT_CONTROL_SIT_ON_GROUND           = 0x1 << CONTROL_SIT_ON_GROUND_INDEX;
-const U32 AGENT_CONTROL_MOUSELOOK                       = 0x1 << CONTROL_MOUSELOOK_INDEX;
-
-const U32 AGENT_CONTROL_NUDGE_AT_POS        = 0x1 << CONTROL_NUDGE_AT_POS_INDEX;
-const U32 AGENT_CONTROL_NUDGE_AT_NEG        = 0x1 << CONTROL_NUDGE_AT_NEG_INDEX;
-const U32 AGENT_CONTROL_NUDGE_LEFT_POS      = 0x1 << CONTROL_NUDGE_LEFT_POS_INDEX;
-const U32 AGENT_CONTROL_NUDGE_LEFT_NEG      = 0x1 << CONTROL_NUDGE_LEFT_NEG_INDEX;
-const U32 AGENT_CONTROL_NUDGE_UP_POS        = 0x1 << CONTROL_NUDGE_UP_POS_INDEX;
-const U32 AGENT_CONTROL_NUDGE_UP_NEG        = 0x1 << CONTROL_NUDGE_UP_NEG_INDEX;
-const U32 AGENT_CONTROL_TURN_LEFT               = 0x1 << CONTROL_TURN_LEFT_INDEX;
-const U32 AGENT_CONTROL_TURN_RIGHT              = 0x1 << CONTROL_TURN_RIGHT_INDEX;
-
-const U32 AGENT_CONTROL_AWAY                            = 0x1 << CONTROL_AWAY_INDEX;
-
-const U32 AGENT_CONTROL_LBUTTON_DOWN            = 0x1 << CONTROL_LBUTTON_DOWN_INDEX;
-const U32 AGENT_CONTROL_LBUTTON_UP                      = 0x1 << CONTROL_LBUTTON_UP_INDEX;
-const U32 AGENT_CONTROL_ML_LBUTTON_DOWN         = 0x1 << CONTROL_ML_LBUTTON_DOWN_INDEX;
-const U32 AGENT_CONTROL_ML_LBUTTON_UP           = ((U32)0x1) << CONTROL_ML_LBUTTON_UP_INDEX;
+const U32 AGENT_CONTROL_AT_POS              = 0x1 << CONTROL_AT_POS_INDEX;                      // 0x00000001
+const U32 AGENT_CONTROL_AT_NEG              = 0x1 << CONTROL_AT_NEG_INDEX;                      // 0x00000002
+const U32 AGENT_CONTROL_LEFT_POS            = 0x1 << CONTROL_LEFT_POS_INDEX;            // 0x00000004
+const U32 AGENT_CONTROL_LEFT_NEG            = 0x1 << CONTROL_LEFT_NEG_INDEX;            // 0x00000008
+const U32 AGENT_CONTROL_UP_POS              = 0x1 << CONTROL_UP_POS_INDEX;                      // 0x00000010
+const U32 AGENT_CONTROL_UP_NEG              = 0x1 << CONTROL_UP_NEG_INDEX;                      // 0x00000020
+const U32 AGENT_CONTROL_PITCH_POS           = 0x1 << CONTROL_PITCH_POS_INDEX;           // 0x00000040
+const U32 AGENT_CONTROL_PITCH_NEG           = 0x1 << CONTROL_PITCH_NEG_INDEX;           // 0x00000080
+const U32 AGENT_CONTROL_YAW_POS             = 0x1 << CONTROL_YAW_POS_INDEX;                     // 0x00000100
+const U32 AGENT_CONTROL_YAW_NEG             = 0x1 << CONTROL_YAW_NEG_INDEX;                     // 0x00000200
+
+const U32 AGENT_CONTROL_FAST_AT             = 0x1 << CONTROL_FAST_AT_INDEX;                     // 0x00000400
+const U32 AGENT_CONTROL_FAST_LEFT           = 0x1 << CONTROL_FAST_LEFT_INDEX;           // 0x00000800
+const U32 AGENT_CONTROL_FAST_UP             = 0x1 << CONTROL_FAST_UP_INDEX;                     // 0x00001000
+
+const U32 AGENT_CONTROL_FLY                                     = 0x1 << CONTROL_FLY_INDEX;                             // 0x00002000
+const U32 AGENT_CONTROL_STOP                            = 0x1 << CONTROL_STOP_INDEX;                    // 0x00004000
+const U32 AGENT_CONTROL_FINISH_ANIM                     = 0x1 << CONTROL_FINISH_ANIM_INDEX;             // 0x00008000
+const U32 AGENT_CONTROL_STAND_UP                        = 0x1 << CONTROL_STAND_UP_INDEX;                // 0x00010000
+const U32 AGENT_CONTROL_SIT_ON_GROUND           = 0x1 << CONTROL_SIT_ON_GROUND_INDEX;   // 0x00020000
+const U32 AGENT_CONTROL_MOUSELOOK                       = 0x1 << CONTROL_MOUSELOOK_INDEX;               // 0x00040000
+
+const U32 AGENT_CONTROL_NUDGE_AT_POS        = 0x1 << CONTROL_NUDGE_AT_POS_INDEX;        // 0x00080000
+const U32 AGENT_CONTROL_NUDGE_AT_NEG        = 0x1 << CONTROL_NUDGE_AT_NEG_INDEX;        // 0x00100000
+const U32 AGENT_CONTROL_NUDGE_LEFT_POS      = 0x1 << CONTROL_NUDGE_LEFT_POS_INDEX;      // 0x00200000
+const U32 AGENT_CONTROL_NUDGE_LEFT_NEG      = 0x1 << CONTROL_NUDGE_LEFT_NEG_INDEX;      // 0x00400000
+const U32 AGENT_CONTROL_NUDGE_UP_POS        = 0x1 << CONTROL_NUDGE_UP_POS_INDEX;        // 0x00800000
+const U32 AGENT_CONTROL_NUDGE_UP_NEG        = 0x1 << CONTROL_NUDGE_UP_NEG_INDEX;        // 0x01000000
+const U32 AGENT_CONTROL_TURN_LEFT               = 0x1 << CONTROL_TURN_LEFT_INDEX;               // 0x02000000
+const U32 AGENT_CONTROL_TURN_RIGHT              = 0x1 << CONTROL_TURN_RIGHT_INDEX;              // 0x04000000
+
+const U32 AGENT_CONTROL_AWAY                            = 0x1 << CONTROL_AWAY_INDEX;                    // 0x08000000
+
+const U32 AGENT_CONTROL_LBUTTON_DOWN            = 0x1 << CONTROL_LBUTTON_DOWN_INDEX;    // 0x10000000
+const U32 AGENT_CONTROL_LBUTTON_UP                      = 0x1 << CONTROL_LBUTTON_UP_INDEX;              // 0x20000000
+const U32 AGENT_CONTROL_ML_LBUTTON_DOWN         = 0x1 << CONTROL_ML_LBUTTON_DOWN_INDEX; // 0x40000000
+const U32 AGENT_CONTROL_ML_LBUTTON_UP           = ((U32)0x1) << CONTROL_ML_LBUTTON_UP_INDEX;    // 0x80000000
 
 const U32 AGENT_CONTROL_AT              = AGENT_CONTROL_AT_POS 
                                                                   | AGENT_CONTROL_AT_NEG 
diff --git a/linden/indra/llcommon/llapp.cpp b/linden/indra/llcommon/llapp.cpp
index a10436a..bd2e377 100644
--- a/linden/indra/llcommon/llapp.cpp
+++ b/linden/indra/llcommon/llapp.cpp
@@ -65,6 +65,7 @@ BOOL LLApp::sLogInSignal = FALSE;
 // static
 LLApp::EAppStatus LLApp::sStatus = LLApp::APP_STATUS_STOPPED; // Keeps track of application status
 LLAppErrorHandler LLApp::sErrorHandler = NULL;
+LLAppErrorHandler LLApp::sSyncErrorHandler = NULL;
 BOOL LLApp::sErrorThreadRunning = FALSE;
 #if !LL_WINDOWS
 LLApp::child_map LLApp::sChildMap;
@@ -262,6 +263,21 @@ void LLApp::setErrorHandler(LLAppErrorHandler handler)
         LLApp::sErrorHandler = handler;
 }
 
+
+void LLApp::setSyncErrorHandler(LLAppErrorHandler handler)
+{
+        LLApp::sSyncErrorHandler = handler;
+}
+
+// static
+void LLApp::runSyncErrorHandler()
+{
+        if (LLApp::sSyncErrorHandler)
+        {
+                LLApp::sSyncErrorHandler();
+        }
+}
+
 // static
 void LLApp::runErrorHandler()
 {
@@ -285,7 +301,13 @@ void LLApp::setStatus(EAppStatus status)
 // static
 void LLApp::setError()
 {
-        setStatus(APP_STATUS_ERROR);
+        if (!isError())
+        {
+                // perform any needed synchronous error-handling
+                runSyncErrorHandler();
+                // set app status to ERROR so that the LLErrorThread notices
+                setStatus(APP_STATUS_ERROR);
+        }
 }
 
 
diff --git a/linden/indra/llcommon/llapp.h b/linden/indra/llcommon/llapp.h
index 1a700cc..50a70ae 100644
--- a/linden/indra/llcommon/llapp.h
+++ b/linden/indra/llcommon/llapp.h
@@ -189,6 +189,7 @@ public:
         // Error handling methods
         //
         void setErrorHandler(LLAppErrorHandler handler);
+        void setSyncErrorHandler(LLAppErrorHandler handler);
 
 #if !LL_WINDOWS
         //
@@ -245,13 +246,15 @@ protected:
 private:
         void setupErrorHandling();              // Do platform-specific error-handling setup (signals, structured exceptions)
 
-        static void runErrorHandler();
+        static void runErrorHandler(); // run shortly after we detect an error, ran in the relatively robust context of the LLErrorThread - preferred.
+        static void runSyncErrorHandler(); // run IMMEDIATELY when we get an error, ran in the context of the faulting thread.
 
         // *NOTE: On Windows, we need a routine to reset the structured
         // exception handler when some evil driver has taken it over for
         // their own purposes
         typedef int(*signal_handler_func)(int signum);
         static LLAppErrorHandler sErrorHandler;
+        static LLAppErrorHandler sSyncErrorHandler;
 
         // Default application threads
         LLErrorThread* mThreadErrorp;           // Waits for app to go to status ERROR, then runs the error callback
diff --git a/linden/indra/llcommon/llapr.cpp b/linden/indra/llcommon/llapr.cpp
index 770cd3f..08c40a4 100644
--- a/linden/indra/llcommon/llapr.cpp
+++ b/linden/indra/llcommon/llapr.cpp
@@ -116,8 +116,10 @@ void LLScopedLock::unlock()
 bool ll_apr_warn_status(apr_status_t status)
 {
         if(APR_SUCCESS == status) return false;
+#ifndef LL_WINDOWS
         char buf[MAX_STRING];   /* Flawfinder: ignore */
         llwarns << "APR: " << apr_strerror(status, buf, MAX_STRING) << llendl;
+#endif
         return true;
 }
 
diff --git a/linden/indra/llcommon/llcommon.vcproj b/linden/indra/llcommon/llcommon.vcproj
index 6b4a0e8..ab4e67a 100644
--- a/linden/indra/llcommon/llcommon.vcproj
+++ b/linden/indra/llcommon/llcommon.vcproj
@@ -432,10 +432,10 @@
                                 RelativePath=".\lllivefile.h">
                         </File>
                         <File
-                                RelativePath=".\lllog.h">
+                                RelativePath=".\lllocalidhashmap.h">
                         </File>
                         <File
-                                RelativePath=".\lllocalidhashmap.h">
+                                RelativePath=".\lllog.h">
                         </File>
                         <File
                                 RelativePath=".\lllslconstants.h">
@@ -504,6 +504,9 @@
                                 RelativePath=".\llskipmap.h">
                         </File>
                         <File
+                                RelativePath=".\llsmoothstep.h">
+                        </File>
+                        <File
                                 RelativePath=".\llstat.h">
                         </File>
                         <File
diff --git a/linden/indra/llcommon/lldarray.h b/linden/indra/llcommon/lldarray.h
index 9bffd63..45e564f 100644
--- a/linden/indra/llcommon/lldarray.h
+++ b/linden/indra/llcommon/lldarray.h
@@ -119,11 +119,12 @@ inline S32 LLDynamicArray<Type,BlockSize>::removeObj(const Type& obj)
         typename std::vector<Type>::iterator iter = std::find(this->begin(), this->end(), obj);
         if (iter != this->end())
         {
+                S32 res = iter - this->begin();
                 typename std::vector<Type>::iterator last = this->end(); 
                 --last;
                 *iter = *last;
                 this->pop_back();
-                return iter - this->begin();
+                return res;
         }
         return FAIL;
 }
diff --git a/linden/indra/llcommon/lldefs.h b/linden/indra/llcommon/lldefs.h
index d081245..0e69626 100644
--- a/linden/indra/llcommon/lldefs.h
+++ b/linden/indra/llcommon/lldefs.h
@@ -218,7 +218,15 @@ inline LLDATATYPE llmin(const LLDATATYPE& d1, const LLDATATYPE& d2, const LLDATA
 template <class LLDATATYPE> 
 inline LLDATATYPE llclamp(const LLDATATYPE& a, const LLDATATYPE& minval, const LLDATATYPE& maxval)
 {
-        return llmin(llmax(a, minval), maxval);
+        if ( a < minval )
+        {
+                return minval;
+        }
+        else if ( a > maxval )
+        {
+                return maxval;
+        }
+        return a;
 }
 
 template <class LLDATATYPE> 
@@ -234,3 +242,4 @@ inline LLDATATYPE llclampb(const LLDATATYPE& a)
 }
 
 #endif // LL_LLDEFS_H
+
diff --git a/linden/indra/llcommon/llerror.cpp b/linden/indra/llcommon/llerror.cpp
index d9ab57c..0e7db89 100644
--- a/linden/indra/llcommon/llerror.cpp
+++ b/linden/indra/llcommon/llerror.cpp
@@ -37,15 +37,16 @@
 
 #include <cctype>
 #ifdef __GNUC__
-#include <cxxabi.h>
-#endif
+# include <cxxabi.h>
+#endif // __GNUC__
 #include <sstream>
 #if !LL_WINDOWS
-#include <syslog.h>
-#endif
+# include <syslog.h>
+# include <unistd.h>
+#endif // !LL_WINDOWS
 #if LL_WINDOWS
-#include <windows.h>
-#endif
+# include <windows.h>
+#endif // LL_WINDOWS
 #include <vector>
 
 #include "llapp.h"
@@ -133,18 +134,58 @@ namespace {
         class RecordToStderr : public LLError::Recorder
         {
         public:
-                RecordToStderr(bool timestamp) : mTimestamp(timestamp) { }
+                RecordToStderr(bool timestamp) : mTimestamp(timestamp), mUseANSI(ANSI_PROBE) { }
 
                 virtual bool wantsTime() { return mTimestamp; }
                 
                 virtual void recordMessage(LLError::ELevel level,
-                                                                        const std::string& message)
+                                           const std::string& message)
                 {
+                        if (ANSI_PROBE == mUseANSI)
+                                mUseANSI = (checkANSI() ? ANSI_YES : ANSI_NO);
+
+                        if (ANSI_YES == mUseANSI)
+                        {
+                                // Default all message levels to bold so we can distinguish our own messages from those dumped by subprocesses and libraries.
+                                colorANSI("1"); // bold
+                                switch (level) {
+                                case LLError::LEVEL_ERROR:
+                                        colorANSI("31"); // red
+                                        break;
+                                case LLError::LEVEL_WARN:
+                                        colorANSI("34"); // blue
+                                        break;
+                                case LLError::LEVEL_DEBUG:
+                                        colorANSI("35"); // magenta
+                                        break;
+                                default:
+                                        break;
+                                }
+                        }
                         fprintf(stderr, "%s\n", message.c_str());
+                        if (ANSI_YES == mUseANSI) colorANSI("0"); // reset
                 }
         
         private:
                 bool mTimestamp;
+                typedef enum ANSIState {ANSI_PROBE, ANSI_YES, ANSI_NO};
+                ANSIState mUseANSI;
+                void colorANSI(const std::string color)
+                {
+                        // ANSI color code escape sequence
+                        fprintf(stderr, "\033[%sm", color.c_str() );
+                };
+                bool checkANSI(void)
+                {
+#if LL_LINUX || LL_DARWIN
+                        // Check whether it's okay to use ANSI; if stderr is
+                        // a tty then we assume yes.  Can be turned off with
+                        // the LL_NO_ANSI_COLOR env var.
+                        return (0 != isatty(2)) &&
+                                (NULL == getenv("LL_NO_ANSI_COLOR"));
+#endif // LL_LINUX
+                        return false;
+                };
         };
 
         class RecordToFixedBuffer : public LLError::Recorder
diff --git a/linden/indra/llcommon/llevent.h b/linden/indra/llcommon/llevent.h
index 83cb79f..ef96ef7 100644
--- a/linden/indra/llcommon/llevent.h
+++ b/linden/indra/llcommon/llevent.h
@@ -185,13 +185,6 @@ protected:
         LLPointer<LLEventDispatcher> mDispatcher;
 };
 
-// Utility mixer class which fires & handles events
-class LLSimpleListenerObservable : public LLObservable, public LLSimpleListener
-{
-public:
-        virtual bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) = 0;
-};
-
 class LLValueChangedEvent : public LLEvent
 {
 public:
diff --git a/linden/indra/llcommon/llfile.cpp b/linden/indra/llcommon/llfile.cpp
index d551f28..32e9622 100644
--- a/linden/indra/llcommon/llfile.cpp
+++ b/linden/indra/llcommon/llfile.cpp
@@ -272,9 +272,11 @@ void llofstream::open(const char* _Filename,	/* Flawfinder: ignore */
 
 void llofstream::close()
 {       // close the C stream
-        llassert(_Filebuffer);
-        if (_Filebuffer->close() == 0)
-                _Myios::setstate(ios_base::failbit);    /*Flawfinder: ignore*/
+        if(is_open())
+        {
+                if (_Filebuffer->close() == 0)
+                        _Myios::setstate(ios_base::failbit);    /*Flawfinder: ignore*/
+        }
 }
 
 llofstream::llofstream(const char *_Filename,
@@ -286,7 +288,8 @@ llofstream::llofstream(const char *_Filename,
 }
 
 llofstream::~llofstream()
-{       // destroy the object
+{       
+        // destroy the object
         if (_ShouldClose)
         {
                 close();
diff --git a/linden/indra/llcommon/llframetimer.cpp b/linden/indra/llcommon/llframetimer.cpp
index 9de3be2..96e5014 100644
--- a/linden/indra/llcommon/llframetimer.cpp
+++ b/linden/indra/llcommon/llframetimer.cpp
@@ -140,3 +140,18 @@ F32 LLFrameTimer::getFrameDeltaTimeF32()
 {
         return (F32)(U64_to_F64(sFrameDeltaTime) * USEC_TO_SEC_F64); 
 }
+
+
+//      static 
+// Return seconds since the current frame started
+F32  LLFrameTimer::getCurrentFrameTime()
+{
+        U64 frame_time = totalTime() - sTotalTime;
+        return (F32)(U64_to_F64(frame_time) * USEC_TO_SEC_F64); 
+}
+
+// Glue code to avoid full class .h file #includes
+F32  getCurrentFrameTime()
+{
+        return (F32)(LLFrameTimer::getCurrentFrameTime());
+}
diff --git a/linden/indra/llcommon/llframetimer.h b/linden/indra/llcommon/llframetimer.h
index bc0d79d..11c4cfc 100644
--- a/linden/indra/llcommon/llframetimer.h
+++ b/linden/indra/llcommon/llframetimer.h
@@ -74,6 +74,9 @@ public:
 
         static F32      getFrameDeltaTimeF32();
 
+        // Return seconds since the current frame started
+        static F32  getCurrentFrameTime();
+
         // MANIPULATORS
         void start();
         void stop();
@@ -144,4 +147,7 @@ protected:
         BOOL mStarted;
 };
 
+// Glue code for Havok (or anything else that doesn't want the full .h files)
+extern F32  getCurrentFrameTime();
+
 #endif  // LL_LLFRAMETIMER_H
diff --git a/linden/indra/llcommon/lllslconstants.h b/linden/indra/llcommon/lllslconstants.h
index ba39098..508fb42 100644
--- a/linden/indra/llcommon/lllslconstants.h
+++ b/linden/indra/llcommon/lllslconstants.h
@@ -70,6 +70,7 @@ const S32 LSL_PRIM_FLEXIBLE		= 21;
 const S32 LSL_PRIM_TEXGEN               = 22;
 const S32 LSL_PRIM_POINT_LIGHT  = 23;
 const S32 LSL_PRIM_CAST_SHADOWS = 24;
+const S32 LSL_PRIM_GLOW         = 25;
 
 const S32 LSL_PRIM_TYPE_BOX             = 0;
 const S32 LSL_PRIM_TYPE_CYLINDER= 1;
diff --git a/linden/indra/llcommon/llmemory.h b/linden/indra/llcommon/llmemory.h
index e1af7ba..c10661a 100644
--- a/linden/indra/llcommon/llmemory.h
+++ b/linden/indra/llcommon/llmemory.h
@@ -419,6 +419,31 @@ protected:
 //   Foo* instance = FooSingleton::getInstance();
 //
 // As currently written, it is not thread-safe.
+#if LL_WINDOWS && _MSC_VER < 1400 // this is Visual C++ 2003 or earlier
+// workaround for VC7 compiler bug
+// adapted from http://www.codeproject.com/KB/tips/VC2003MeyersSingletonBug.aspx
+// our version doesn't introduce a nested struct so that you can still declare LLSingleton<MyClass>
+// a friend and hide your constructor
+
+template <typename T>
+class LLSingleton
+{
+public:
+        static T* getInstance()
+    {
+        LLSingleton<T> singleton;
+        return singleton.get();
+    }
+private:
+        T* get()
+    {
+        static T instance;
+        return &instance;
+    }
+
+};
+#else
+
 template <typename T>
 class LLSingleton
 {
@@ -430,6 +455,8 @@ public:
         }
 };
 
+#endif
+
 //----------------------------------------------------------------------------
 
 // Return the resident set size of the current process, in bytes.
diff --git a/linden/indra/llcommon/llpreprocessor.h b/linden/indra/llcommon/llpreprocessor.h
index 8d38904..e99b103 100644
--- a/linden/indra/llcommon/llpreprocessor.h
+++ b/linden/indra/llcommon/llpreprocessor.h
@@ -79,9 +79,16 @@
 
 #endif
 
+
 // Deal with the differeneces on Windows
 #if LL_MSVC
-#define snprintf safe_snprintf          /* Flawfinder: ignore */
+namespace snprintf_hack
+{
+        int snprintf(char *str, size_t size, const char *format, ...);
+}
+
+// #define snprintf safe_snprintf               /* Flawfinder: ignore */
+using snprintf_hack::snprintf;
 #endif  // LL_MSVC
 
 // Static linking with apr on windows needs to be declared.
diff --git a/linden/indra/llcommon/llptrskiplist.h b/linden/indra/llcommon/llptrskiplist.h
index df35d30..f1df27a 100644
--- a/linden/indra/llcommon/llptrskiplist.h
+++ b/linden/indra/llcommon/llptrskiplist.h
@@ -34,6 +34,7 @@
 
 #include "llerror.h"
 //#include "vmath.h"
+#include "llrand.h"
 
 /////////////////////////////////////////////
 //
diff --git a/linden/indra/llcommon/llskiplist.h b/linden/indra/llcommon/llskiplist.h
index 78e6f0a..c88b310 100644
--- a/linden/indra/llcommon/llskiplist.h
+++ b/linden/indra/llcommon/llskiplist.h
@@ -32,6 +32,7 @@
 #define LL_LLSKIPLIST_H
 
 #include "llrand.h"
+#include "llrand.h"
 
 // NOTA BENE: Insert first needs to be < NOT <=
 // Binary depth must be >= 2
diff --git a/linden/indra/newview/llsphere.h b/linden/indra/llcommon/llsmoothstep.h
index 3a827c9..c2b3447 100644
--- a/linden/indra/newview/llsphere.h
+++ b/linden/indra/llcommon/llsmoothstep.h
@@ -1,6 +1,6 @@
 /** 
- * @file llsphere.h
- * @brief interface for the LLSphere class.
+ * @file llsmoothstep.h
+ * @brief Smoothstep - transition from 0 to 1 - function, first and second derivatives all continuous (smooth)
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
@@ -29,30 +29,22 @@
  * $/LicenseInfo$
  */
 
-#ifndef LL_LLSPHERE_H
-#define LL_LLSPHERE_H
+#ifndef LL_LLSMOOTHSTEP_H
+#define LL_LLSMOOTHSTEP_H
 
-//#include "vmath.h"
-#include "llmath.h"
-#include "v3math.h"
-#include "v4math.h"
-#include "m3math.h"
-#include "m4math.h"
-#include "v4color.h"
-#include "llgl.h"
+template <class LLDATATYPE>
+inline LLDATATYPE llsmoothstep(const LLDATATYPE& edge0, const LLDATATYPE& edge1, const LLDATATYPE& value)
+{
+    if (value < edge0)
+                return (LLDATATYPE)0;
 
-void lat2xyz(LLVector3 * result, F32 lat, F32 lon);                     // utility routine
+        if (value >= edge1)
+                return (LLDATATYPE)1;
 
-class LLSphere  
-{
-public:
-        LLGLuint        mDList[5];
+        // Scale/bias into [0..1] range
+        LLDATATYPE scaled_value = (value - edge0) / (edge1 - edge0);
 
-        void prerender();
-        void cleanupGL();
-        void render(F32 pixel_area);            // of a box of size 1.0 at that position
-        void render();                                          // render at highest LOD
-};
+        return scaled_value * scaled_value * (3 - 2 * scaled_value);
+}
 
-extern LLSphere gSphere;
-#endif
+#endif // LL_LLSMOOTHSTEP_H
diff --git a/linden/indra/llcommon/llstatenums.h b/linden/indra/llcommon/llstatenums.h
index 6fa61e1..bde6ade 100644
--- a/linden/indra/llcommon/llstatenums.h
+++ b/linden/indra/llcommon/llstatenums.h
@@ -57,7 +57,13 @@ enum
         LL_SIM_STAT_VIRTUAL_SIZE_KB,
         LL_SIM_STAT_RESIDENT_SIZE_KB,
         LL_SIM_STAT_PENDING_LOCAL_UPLOADS,
-        LL_SIM_STAT_TOTAL_UNACKED_BYTES
+        LL_SIM_STAT_TOTAL_UNACKED_BYTES,
+        LL_SIM_STAT_PHYSICS_PINNED_TASKS,
+        LL_SIM_STAT_PHYSICS_LOD_TASKS,
+        LL_SIM_STAT_SIMPHYSICSSTEPMS,
+        LL_SIM_STAT_SIMPHYSICSSHAPEMS,
+        LL_SIM_STAT_SIMPHYSICSOTHERMS,
+        LL_SIM_STAT_SIMPHYSICSMEMORY
 };
 
 #endif
diff --git a/linden/indra/llcommon/llstl.h b/linden/indra/llcommon/llstl.h
index 2719888..9a24185 100644
--- a/linden/indra/llcommon/llstl.h
+++ b/linden/indra/llcommon/llstl.h
@@ -33,6 +33,9 @@
 #define LL_LLSTL_H
 
 #include <functional>
+#include <algorithm>
+#include <map>
+#include <vector>
 #include <set>
 #include <deque>
 
diff --git a/linden/indra/llcommon/llstreamtools.cpp b/linden/indra/llcommon/llstreamtools.cpp
index 669bdd0..b95ee60 100644
--- a/linden/indra/llcommon/llstreamtools.cpp
+++ b/linden/indra/llcommon/llstreamtools.cpp
@@ -263,20 +263,14 @@ bool get_word(std::string& output_string, std::istream& input_stream, int n)
 // get everything up to and including the next newline
 bool get_line(std::string& output_string, std::istream& input_stream)
 {
+        output_string.clear();
         char c = input_stream.get();
         while (input_stream.good())
         {
-                if ('\r' == c)
-                {
-                        // skip carriage returns
-                }
-                else
+                output_string += c;
+                if ('\n' == c)
                 {
-                        output_string += c;
-                        if ('\n' == c)
-                        {
-                                break;
-                        }
+                        break;
                 }
                 c = input_stream.get();
         } 
@@ -288,27 +282,21 @@ bool get_line(std::string& output_string, std::istream& input_stream)
 // add a newline on the end if bail before actual line ending
 bool get_line(std::string& output_string, std::istream& input_stream, int n)
 {
+        output_string.clear();
         int char_count = 0;
         char c = input_stream.get();
         while (input_stream.good() && char_count < n)
         {
                 char_count++;
                 output_string += c;
-                if ('\r' == c)
+                if ('\n' == c)
                 {
-                        // skip carriage returns
+                        break;
                 }
-                else
+                if (char_count >= n)
                 {
-                        if ('\n' == c)
-                        {
-                                break;
-                        }
-                        if (char_count >= n)
-                        {
-                                output_string.append("\n");
-                                break;
-                        }
+                        output_string.append("\n");
+                        break;
                 }
                 c = input_stream.get();
         } 
@@ -408,49 +396,6 @@ void replace_newlines_with_whitespace(std::string& line)
         }
 }
 
-// returns 1 for solitary "{"
-// returns -1 for solitary "}"
-// otherwise returns 0
-int get_brace_count(const std::string& line)
-{
-        int index = 0;
-        int line_size = line.size();
-        char c = 0;
-        while (index < line_size)
-        {
-                c = line[index];
-                index++;
-                if (!isspace(c))
-                {
-                        break;
-                }
-        }
-        char brace = c;
-        // make sure the rest of the line is whitespace
-        while (index < line_size)
-        {
-                c = line[index];
-                if (!isspace(c))
-                {
-                        break;
-                }
-                index++;
-        }
-        if ('\n' != c)
-        {
-                return 0;
-        }
-        if ('{' == brace)
-        {
-                return 1;
-        }
-        else if ('}' == brace)
-        {
-                return -1;
-        }
-        return 0;
-}
-
 // erases any double-quote characters in 'line'
 void remove_double_quotes(std::string& line)
 {
@@ -498,7 +443,7 @@ void get_keyword_and_value(std::string& keyword,
         }
 
         // get the keyword
-        keyword.assign("");
+        keyword.clear();
         while (line_index < line_size)
         {
                 c = line[line_index];
@@ -510,6 +455,8 @@ void get_keyword_and_value(std::string& keyword,
                 line_index++;
         }
 
+        // get the value
+        value.clear();
         if (keyword.size() > 0
                 && '\r' != line[line_index]
                 && '\n' != line[line_index])
@@ -523,8 +470,6 @@ void get_keyword_and_value(std::string& keyword,
                         line_index++;
                 }
 
-                // get the value
-                value.assign("");
                 while (line_index < line_size)
                 {
                         c = line[line_index];
diff --git a/linden/indra/llcommon/llstreamtools.h b/linden/indra/llcommon/llstreamtools.h
index 9db90c8..d84e53b 100644
--- a/linden/indra/llcommon/llstreamtools.h
+++ b/linden/indra/llcommon/llstreamtools.h
@@ -96,11 +96,6 @@ void escape_string(std::string& line);
 // replaces each '\n' character with ' '
 void replace_newlines_with_whitespace(std::string& line);
 
-// returns 1 for solitary "{"
-// returns -1 for solitary "}"
-// otherwise returns 0
-int get_brace_count(const std::string& line);
-
 // erases any double-quote characters in line
 void remove_double_quotes(std::string& line);
 
diff --git a/linden/indra/llcommon/llstring.cpp b/linden/indra/llcommon/llstring.cpp
index 73c80e7..a1f19ad 100644
--- a/linden/indra/llcommon/llstring.cpp
+++ b/linden/indra/llcommon/llstring.cpp
@@ -804,16 +804,19 @@ std::string utf8str_removeCRLF(const std::string& utf8str)
 
 #if LL_WINDOWS
 // documentation moved to header. Phoenix 2007-11-27
-int safe_snprintf(char *str, size_t size, const char *format, ...)
+namespace snprintf_hack
 {
-        va_list args;
-        va_start(args, format);
-
-        int num_written = _vsnprintf(str, size, format, args); /* Flawfinder: ignore */
-        va_end(args);
-        
-        str[size-1] = '\0'; // always null terminate
-        return num_written;
+        int snprintf(char *str, size_t size, const char *format, ...)
+        {
+                va_list args;
+                va_start(args, format);
+
+                int num_written = _vsnprintf(str, size, format, args); /* Flawfinder: ignore */
+                va_end(args);
+                
+                str[size-1] = '\0'; // always null terminate
+                return num_written;
+        }
 }
 
 std::string ll_convert_wide_to_string(const wchar_t* in)
diff --git a/linden/indra/llcommon/llversionserver.h b/linden/indra/llcommon/llversionserver.h
index 05ac9b3..e865b6a 100644
--- a/linden/indra/llcommon/llversionserver.h
+++ b/linden/indra/llcommon/llversionserver.h
@@ -33,9 +33,9 @@
 #define LL_LLVERSIONSERVER_H
 
 const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 19;
-const S32 LL_VERSION_PATCH = 1;
-const S32 LL_VERSION_BUILD = 3;
+const S32 LL_VERSION_MINOR = 20;
+const S32 LL_VERSION_PATCH = 0;
+const S32 LL_VERSION_BUILD = 83892;
 
 const char * const LL_CHANNEL = "Second Life Server";
 
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index f00657a..06f6a82 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -33,9 +33,9 @@
 #define LL_LLVERSIONVIEWER_H
 
 const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 19;
-const S32 LL_VERSION_PATCH = 1;
-const S32 LL_VERSION_BUILD = 4;
+const S32 LL_VERSION_MINOR = 20;
+const S32 LL_VERSION_PATCH = 2;
+const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Release";