168 files changed, 1949 insertions, 516 deletions
diff --git a/linden/indra/llcommon/CMakeLists.txt b/linden/indra/llcommon/CMakeLists.txt
index 4001e1f..3f14be6 100644
--- a/linden/indra/llcommon/CMakeLists.txt
+++ b/linden/indra/llcommon/CMakeLists.txt
@@ -20,6 +20,7 @@ set(llcommon_SOURCE_FILES
    llcommon.cpp
    llcrc.cpp
    llcriticaldamp.cpp
+    llcursortypes.cpp
    lldate.cpp
    llerror.cpp
    llerrorthread.cpp
@@ -90,6 +91,7 @@ set(llcommon_HEADER_FILES
    llcommon.h
    llcrc.h
    llcriticaldamp.h
+    llcursortypes.h
    lldarray.h
    lldarrayptr.h
    lldate.h
diff --git a/linden/indra/llcommon/bitpack.h b/linden/indra/llcommon/bitpack.h
index bcbc880..cb9c70c 100644
--- a/linden/indra/llcommon/bitpack.h
+++ b/linden/indra/llcommon/bitpack.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/ctype_workaround.h b/linden/indra/llcommon/ctype_workaround.h
index ee35986..32ccb86 100644
--- a/linden/indra/llcommon/ctype_workaround.h
+++ b/linden/indra/llcommon/ctype_workaround.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/doublelinkedlist.h b/linden/indra/llcommon/doublelinkedlist.h
index 993ef00..a87860c 100644
--- a/linden/indra/llcommon/doublelinkedlist.h
+++ b/linden/indra/llcommon/doublelinkedlist.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/imageids.h b/linden/indra/llcommon/imageids.h
index 73ab1b8..832708c 100644
--- a/linden/indra/llcommon/imageids.h
+++ b/linden/indra/llcommon/imageids.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -55,6 +56,7 @@ const LLUUID IMG_SPARK			("d2e75ac1-d0fb-4532-820e-a20034ac814d"); // dataserver
 const LLUUID IMG_FIRE                   ("aca40aa8-44cf-44ca-a0fa-93e1a2986f82"); // dataserver
 const LLUUID IMG_FACE_SELECT    ("a85ac674-cb75-4af6-9499-df7c5aaf7a28"); // face selector
 const LLUUID IMG_DEFAULT_AVATAR ("c228d1cf-4b5d-4ba8-84f4-899a0796aa97"); // dataserver
+const LLUUID IMG_INVISIBLE              ("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"); // dataserver
 const LLUUID IMG_EXPLOSION                              ("68edcf47-ccd7-45b8-9f90-1649d7f12806"); // On dataserver
 const LLUUID IMG_EXPLOSION_2                    ("21ce046c-83fe-430a-b629-c7660ac78d7c"); // On dataserver
diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index e2d48da..ae7863d 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -117,6 +118,7 @@ const	char* const	DEFAULT_AGNI_DATA_SERVER	= "63.211.139.100";
 const   char* const     DEFAULT_AGNI_ASSET_SERVER       = "http://asset.agni.lindenlab.com:80";
 // Information about what ports are for what services is in the wiki Name Space Ports page
+// https://wiki.lindenlab.com/wiki/Name_Space_Ports
 const   char* const DEFAULT_LOCAL_ASSET_SERVER  = "http://localhost:12041/asset/tmp";
 const   char* const     LOCAL_ASSET_URL_FORMAT          = "http://%s:12041/asset";
@@ -137,6 +139,10 @@ const   U32		DEFAULT_CAP_PROXY_PORT			= 12043;
 const   U32             DEFAULT_INV_DATA_SERVER_PORT    = 12044;
 const   U32             DEFAULT_CGI_SERVICES_PORT               = 12045;
+// Mapserver uses ports 12124 - 12139 to allow multiple mapservers to run
+// on a single host for map tile generation. JC
+const   U32             DEFAULT_MAPSERVER_PORT                  = 12124;
 // For automatic port discovery when running multiple viewers on one host
 const   U32             PORT_DISCOVERY_RANGE_MIN                = 13000;
 const   U32             PORT_DISCOVERY_RANGE_MAX                = PORT_DISCOVERY_RANGE_MIN + 50;
@@ -238,12 +244,11 @@ const F32 DEFAULT_WATER_HEIGHT 	= 20.0f;
 // Maturity ratings for simulators
 const U8 SIM_ACCESS_MIN         = 0;            // Treated as 'unknown', usually ends up being SIM_ACCESS_PG
-const U8 SIM_ACCESS_TRIAL       = 7;
 const U8 SIM_ACCESS_PG          = 13;
 const U8 SIM_ACCESS_MATURE      = 21;
 const U8 SIM_ACCESS_ADULT       = 42;           // Seriously Adult Only
 const U8 SIM_ACCESS_DOWN        = 254;
-const U8 SIM_ACCESS_MAX         = SIM_ACCESS_MATURE;
+const U8 SIM_ACCESS_MAX         = SIM_ACCESS_ADULT;
 // group constants
 const S32 MAX_AGENT_GROUPS = 25;
@@ -354,6 +359,8 @@ const U32 MAP_ITEM_POPULAR = 0x04;
 const U32 MAP_ITEM_AGENT_LOCATIONS = 0x06;
 const U32 MAP_ITEM_LAND_FOR_SALE = 0x07;
 const U32 MAP_ITEM_CLASSIFIED = 0x08;
+const U32 MAP_ITEM_ADULT_EVENT = 0x09;
+const U32 MAP_ITEM_LAND_FOR_SALE_ADULT = 0x0a;
 // Crash reporter behavior
 const char* const CRASH_SETTINGS_FILE = "settings_crash_behavior.xml";
diff --git a/linden/indra/llcommon/is_approx_equal_fraction.h b/linden/indra/llcommon/is_approx_equal_fraction.h
new file mode 100644
index 0000000..d369fbc
--- /dev/null
+++ b/linden/indra/llcommon/is_approx_equal_fraction.h
@@ -0,0 +1,85 @@
+/**
+ * @file   is_approx_equal_fraction.h
+ * @author Nat Goodspeed
+ * @date   2009-01-28
+ * @brief  lltut.h uses is_approx_equal_fraction(). Moved to this header
+ *         file in llcommon so we can use lltut.h for llcommon tests without
+ *         making llcommon depend on llmath.
+ * 
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#if ! defined(LL_IS_APPROX_EQUAL_FRACTION_H)
+#define LL_IS_APPROX_EQUAL_FRACTION_H
+#include "lldefs.h"
+#include <cmath>
+/**
+ * Originally llmath.h contained two complete implementations of
+ * is_approx_equal_fraction(), with signatures as below, bodies identical save
+ * where they specifically mentioned F32/F64. Unifying these into a template
+ * makes sense -- but to preserve the compiler's overload-selection behavior,
+ * we still wrap the template implementation with the specific overloaded
+ * signatures.
+ */
+template <typename FTYPE>
+inline BOOL is_approx_equal_fraction_impl(FTYPE x, FTYPE y, U32 frac_bits)
+{
+    BOOL ret = TRUE;
+    FTYPE diff = (FTYPE) fabs(x - y);
+    S32 diffInt = (S32) diff;
+    S32 diffFracTolerance = (S32) ((diff - (FTYPE) diffInt) * (1 << frac_bits));
+    // if integer portion is not equal, not enough bits were used for packing
+    // so error out since either the use case is not correct OR there is
+    // an issue with pack/unpack. should fail in either case.
+    // for decimal portion, make sure that the delta is no more than 1
+    // based on the number of bits used for packing decimal portion.
+    if (diffInt != 0 || diffFracTolerance > 1)
+    {
+        ret = FALSE;
+    }
+    return ret;
+}
+/// F32 flavor
+inline BOOL is_approx_equal_fraction(F32 x, F32 y, U32 frac_bits)
+{
+    return is_approx_equal_fraction_impl<F32>(x, y, frac_bits);
+}
+/// F64 flavor
+inline BOOL is_approx_equal_fraction(F64 x, F64 y, U32 frac_bits)
+{
+    return is_approx_equal_fraction_impl<F64>(x, y, frac_bits);
+}
+#endif /* ! defined(LL_IS_APPROX_EQUAL_FRACTION_H) */
diff --git a/linden/indra/llcommon/linden_common.h b/linden/indra/llcommon/linden_common.h
index 70803ff..f9d5877 100644
--- a/linden/indra/llcommon/linden_common.h
+++ b/linden/indra/llcommon/linden_common.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/linked_lists.h b/linden/indra/llcommon/linked_lists.h
index f173d61..3d89a05 100644
--- a/linden/indra/llcommon/linked_lists.h
+++ b/linden/indra/llcommon/linked_lists.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llagentconstants.h b/linden/indra/llcommon/llagentconstants.h
index fda8e9d..282db0a 100644
--- a/linden/indra/llcommon/llagentconstants.h
+++ b/linden/indra/llcommon/llagentconstants.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llapp.cpp b/linden/indra/llcommon/llapp.cpp
index 6406d12..199315f 100644
--- a/linden/indra/llcommon/llapp.cpp
+++ b/linden/indra/llcommon/llapp.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -57,7 +58,7 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *);
 /* OSX doesn't support SIGRT* */
 S32 LL_SMACKDOWN_SIGNAL = SIGUSR1;
 S32 LL_HEARTBEAT_SIGNAL = SIGUSR2;
-# else
+# else // linux or (assumed) other similar unixoid
 /* We want reliable delivery of our signals - SIGRT* is it. */
 /* Old LinuxThreads versions eat SIGRTMIN+0 to SIGRTMIN+2, avoid those. */
 /* Note that SIGRTMIN/SIGRTMAX may expand to a glibc function call with a
@@ -89,6 +90,12 @@ LLAppChildCallback LLApp::sDefaultChildCallback = NULL;
 LLApp::LLApp() : mThreadErrorp(NULL)
 {
+        commonCtor();
+        startErrorThread();
+}
+void LLApp::commonCtor()
+{
        // Set our status to running
        setStatus(APP_STATUS_RUNNING);
@@ -96,9 +103,9 @@ LLApp::LLApp() : mThreadErrorp(NULL)
 #if !LL_WINDOWS
        // This must be initialized before the error handler.
-        sSigChildCount = new LLAtomicU32(0);    
+        sSigChildCount = new LLAtomicU32(0);
 #endif
-        
        // Setup error handling
        setupErrorHandling();
@@ -118,6 +125,13 @@ LLApp::LLApp() : mThreadErrorp(NULL)
        // Set the application to this instance.
        sApplication = this;
+}
+LLApp::LLApp(LLErrorThread *error_thread) :
+        mThreadErrorp(error_thread)
+{
+        commonCtor();
 }
@@ -261,17 +275,20 @@ void LLApp::setupErrorHandling()
 #endif
+}
+void LLApp::startErrorThread()
+{
        //
        // Start the error handling thread, which is responsible for taking action
        // when the app goes into the APP_STATUS_ERROR state
        //
-        llinfos << "LLApp::setupErrorHandling - Starting error thread" << llendl;
+        llinfos << "Starting error thread" << llendl;
        mThreadErrorp = new LLErrorThread();
        mThreadErrorp->setUserData((void *) this);
-        mThreadErrorp->start();
+        mThreadErrorp->start(); 
 }
 void LLApp::setErrorHandler(LLAppErrorHandler handler)
 {
        LLApp::sErrorHandler = handler;
@@ -542,7 +559,9 @@ void setup_signals()
        sigaction(LL_SMACKDOWN_SIGNAL, &act, NULL);
        // Asynchronous signals that are normally ignored
+#ifndef LL_IGNORE_SIGCHLD
        sigaction(SIGCHLD, &act, NULL);
+#endif // LL_IGNORE_SIGCHLD
        sigaction(SIGUSR2, &act, NULL);
        // Asynchronous signals that result in attempted graceful exit
@@ -576,7 +595,9 @@ void clear_signals()
        sigaction(LL_SMACKDOWN_SIGNAL, &act, NULL);
        // Asynchronous signals that are normally ignored
+#ifndef LL_IGNORE_SIGCHLD
        sigaction(SIGCHLD, &act, NULL);
+#endif // LL_IGNORE_SIGCHLD
        // Asynchronous signals that result in attempted graceful exit
        sigaction(SIGHUP, &act, NULL);
diff --git a/linden/indra/llcommon/llapp.h b/linden/indra/llcommon/llapp.h
index b5e72f5..f8a593c 100644
--- a/linden/indra/llcommon/llapp.h
+++ b/linden/indra/llcommon/llapp.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -77,6 +78,11 @@ public:
        LLApp();
        virtual ~LLApp();
+protected:
+        LLApp(LLErrorThread* error_thread);
+        void commonCtor();
+public:
+        
        /** 
         * @brief Return the static app instance if one was created.
         */
@@ -183,6 +189,8 @@ public:
 #if !LL_WINDOWS
        static U32  getSigChildCount();
        static void incSigChildCount();
+#else
+#define getpid GetCurrentProcessId
 #endif
        static int getPid();
@@ -245,8 +253,9 @@ protected:
        void stepFrame();
 private:
+        void startErrorThread();
+        
        void setupErrorHandling();              // Do platform-specific error-handling setup (signals, structured exceptions)
        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.
diff --git a/linden/indra/llcommon/llapr.cpp b/linden/indra/llcommon/llapr.cpp
index 589d3f5..669afc5 100644
--- a/linden/indra/llcommon/llapr.cpp
+++ b/linden/indra/llcommon/llapr.cpp
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -35,8 +36,11 @@
 #include "llapr.h"
 apr_pool_t *gAPRPoolp = NULL; // Global APR memory pool
+LLVolatileAPRPool *LLAPRFile::sAPRFilePoolp = NULL ; //global volatile APR memory pool.
 apr_thread_mutex_t *gLogMutexp = NULL;
+apr_thread_mutex_t *gCallStacksLogMutexp = NULL;
+const S32 FULL_VOLATILE_APR_POOL = 1024 ; //number of references to LLVolatileAPRPool
 void ll_init_apr()
 {
@@ -45,9 +49,15 @@ void ll_init_apr()
                // Initialize APR and create the global pool
                apr_initialize();
                apr_pool_create(&gAPRPoolp, NULL);
+                
                // Initialize the logging mutex
                apr_thread_mutex_create(&gLogMutexp, APR_THREAD_MUTEX_UNNESTED, gAPRPoolp);
+                apr_thread_mutex_create(&gCallStacksLogMutexp, APR_THREAD_MUTEX_UNNESTED, gAPRPoolp);
+        }
+        if(!LLAPRFile::sAPRFilePoolp)
+        {
+                LLAPRFile::sAPRFilePoolp = new LLVolatileAPRPool() ;
        }
 }
@@ -64,36 +74,140 @@ void ll_cleanup_apr()
                apr_thread_mutex_destroy(gLogMutexp);
                gLogMutexp = NULL;
        }
+        if (gCallStacksLogMutexp)
+        {
+                // Clean up the logging mutex
+                // All other threads NEED to be done before we clean up APR, so this is okay.
+                apr_thread_mutex_destroy(gCallStacksLogMutexp);
+                gCallStacksLogMutexp = NULL;
+        }
        if (gAPRPoolp)
        {
                apr_pool_destroy(gAPRPoolp);
                gAPRPoolp = NULL;
        }
+        if (LLAPRFile::sAPRFilePoolp)
+        {
+                delete LLAPRFile::sAPRFilePoolp ;
+                LLAPRFile::sAPRFilePoolp = NULL ;
+        }
        apr_terminate();
 }
 //
+//
 //LLAPRPool
 //
-LLAPRPool::LLAPRPool(apr_pool_t *parent, apr_size_t size) 
+LLAPRPool::LLAPRPool(apr_pool_t *parent, apr_size_t size, BOOL releasePoolFlag) 
+{
+        mParent = parent ;
+        mReleasePoolFlag = releasePoolFlag ;
+        mMaxSize = size ;
+        mPool = NULL ;
+        createAPRPool() ;
+}
+LLAPRPool::~LLAPRPool() 
 {
-        mStatus = apr_pool_create(&mPool, parent);
+        releaseAPRPool() ;
+}
-        if(size > 0) //size is the number of blocks (which is usually 4K), NOT bytes.
+void LLAPRPool::createAPRPool()
+{
+        if(mPool)
+        {
+                return ;
+        }
+        mStatus = apr_pool_create(&mPool, mParent);
+        ll_apr_warn_status(mStatus) ;
+        if(mMaxSize > 0) //size is the number of blocks (which is usually 4K), NOT bytes.
        {
                apr_allocator_t *allocator = apr_pool_allocator_get(mPool); 
                if (allocator) 
                { 
-                        apr_allocator_max_free_set(allocator, size) ;
+                        apr_allocator_max_free_set(allocator, mMaxSize) ;
                }
        }
 }
-LLAPRPool::~LLAPRPool() 
+void LLAPRPool::releaseAPRPool()
 {
-        apr_pool_destroy(mPool) ;
+        if(!mPool)
+        {
+                return ;
+        }
+        if(!mParent || mReleasePoolFlag)
+        {
+                apr_pool_destroy(mPool) ;
+                mPool = NULL ;
+        }
+}
+apr_pool_t* LLAPRPool::getAPRPool() 
+{
+        if(!mPool)
+        {
+                createAPRPool() ;
+        }
+        
+        return mPool ; 
+}
+LLVolatileAPRPool::LLVolatileAPRPool(apr_pool_t *parent, apr_size_t size, BOOL releasePoolFlag) 
+                                  : LLAPRPool(parent, size, releasePoolFlag)
+{
+        mNumActiveRef = 0 ;
+        mNumTotalRef = 0 ;
+}
+apr_pool_t* LLVolatileAPRPool::getVolatileAPRPool() 
+{
+        mNumTotalRef++ ;
+        mNumActiveRef++ ;
+        return getAPRPool() ;
 }
+void LLVolatileAPRPool::clearVolatileAPRPool() 
+{
+        if(mNumActiveRef > 0)
+        {
+                mNumActiveRef--;
+                if(mNumActiveRef < 1)
+                {
+                        if(isFull()) 
+                        {
+                                mNumTotalRef = 0 ;
+                                //destroy the apr_pool.
+                                releaseAPRPool() ;
+                        }
+                        else 
+                        {
+                                //This does not actually free the memory, 
+                                //it just allows the pool to re-use this memory for the next allocation. 
+                                apr_pool_clear(mPool) ;
+                        }
+                }
+        }
+        else
+        {
+                llassert_always(mNumActiveRef > 0) ;
+        }
+        //paranoia check if the pool is jammed.
+        //will remove the check before going to release.
+        llassert_always(mNumTotalRef < (FULL_VOLATILE_APR_POOL << 2)) ;
+}
+BOOL LLVolatileAPRPool::isFull()
+{
+        return mNumTotalRef > FULL_VOLATILE_APR_POOL ;
+}
+//---------------------------------------------------------------------
 //
 // LLScopedLock
 //
@@ -132,9 +246,8 @@ void LLScopedLock::unlock()
        }
 }
-//
+//---------------------------------------------------------------------
-// Misc functions
-//
 bool ll_apr_warn_status(apr_status_t status)
 {
        if(APR_SUCCESS == status) return false;
@@ -150,55 +263,110 @@ void ll_apr_assert_status(apr_status_t status)
        llassert(ll_apr_warn_status(status) == false);
 }
-// File I/O
+//---------------------------------------------------------------------
-apr_file_t* ll_apr_file_open(const std::string& filename, apr_int32_t flags, S32* sizep, apr_pool_t* pool)
+//
+// LLAPRFile functions
+//
+LLAPRFile::LLAPRFile()
+{
+        mFile = NULL ;
+        mCurrentFilePoolp = NULL ;
+}
+LLAPRFile::~LLAPRFile()
+{
+        close() ;
+}
+apr_status_t LLAPRFile::close() 
+{
+        apr_status_t ret = APR_SUCCESS ;
+        if(mFile)
+        {
+                ret = apr_file_close(mFile);
+                mFile = NULL ;
+        }
+        if(mCurrentFilePoolp)
+        {
+                mCurrentFilePoolp->clearVolatileAPRPool() ;
+                mCurrentFilePoolp = NULL ;
+        }
+        return ret ;
+}
+apr_status_t LLAPRFile::open(LLVolatileAPRPool* pool, const std::string& filename, apr_int32_t flags, S32* sizep)
+{
+        apr_status_t s ;
+        s = open(filename, flags, pool ? pool->getVolatileAPRPool() : NULL, sizep) ;
+        
+        if(!mCurrentFilePoolp)
+        {
+                mCurrentFilePoolp = pool ;
+                if(!mFile)
+                {
+                        close() ;
+                }
+        }
+        return s ;
+}
+apr_status_t LLAPRFile::open(const std::string& filename, apr_int32_t flags, apr_pool_t* pool, S32* sizep)
 {
-        apr_file_t* apr_file;
        apr_status_t s;
-        if (pool == NULL) pool = gAPRPoolp;
-        s = apr_file_open(&apr_file, filename.c_str(), flags, APR_OS_DEFAULT, pool);
+        //check if already open some file
-        if (s != APR_SUCCESS)
+        llassert_always(!mFile) ;
+        llassert_always(!mCurrentFilePoolp) ;
+        
+        s = apr_file_open(&mFile, filename.c_str(), flags, APR_OS_DEFAULT, getAPRFilePool(pool));
+        if (s != APR_SUCCESS || !mFile)
        {
+                mFile = NULL ;
+                close() ;
                if (sizep)
                {
                        *sizep = 0;
                }
-                return NULL;
+                return s;
        }
        if (sizep)
        {
                S32 file_size = 0;
                apr_off_t offset = 0;
-                if (apr_file_seek(apr_file, APR_END, &offset) == APR_SUCCESS)
+                if (apr_file_seek(mFile, APR_END, &offset) == APR_SUCCESS)
                {
                        llassert_always(offset <= 0x7fffffff);
                        file_size = (S32)offset;
                        offset = 0;
-                        apr_file_seek(apr_file, APR_SET, &offset);
+                        apr_file_seek(mFile, APR_SET, &offset);
                }
                *sizep = file_size;
        }
-        return apr_file;
+        return s;
 }
-apr_file_t* ll_apr_file_open(const std::string& filename, apr_int32_t flags, S32* sizep)
-{
+apr_pool_t* LLAPRFile::getAPRFilePool(apr_pool_t* pool)
-        return ll_apr_file_open(filename, flags, sizep, NULL);
+{       
-}
+        if(!pool)
-apr_file_t* ll_apr_file_open(const std::string& filename, apr_int32_t flags, apr_pool_t* pool)
+        {
-{
+                mCurrentFilePoolp = sAPRFilePoolp ;
-        return ll_apr_file_open(filename, flags, NULL, pool);
+                return mCurrentFilePoolp->getVolatileAPRPool() ;
-}
+        }
-apr_file_t* ll_apr_file_open(const std::string& filename, apr_int32_t flags)
-{
+        return pool ;
-        return ll_apr_file_open(filename, flags, NULL, NULL);
 }
-S32 ll_apr_file_read(apr_file_t* apr_file, void *buf, S32 nbytes)
+// File I/O
+S32 LLAPRFile::read(void *buf, S32 nbytes)
 {
+        llassert_always(mFile) ;
+        
        apr_size_t sz = nbytes;
-        apr_status_t s = apr_file_read(apr_file, buf, &sz);
+        apr_status_t s = apr_file_read(mFile, buf, &sz);
        if (s != APR_SUCCESS)
        {
                return 0;
@@ -210,165 +378,273 @@ S32 ll_apr_file_read(apr_file_t* apr_file, void *buf, S32 nbytes)
        }
 }
-S32 ll_apr_file_read_ex(const std::string& filename, apr_pool_t* pool, void *buf, S32 offset, S32 nbytes)
+S32 LLAPRFile::write(const void *buf, S32 nbytes)
 {
-        if (pool == NULL) pool = gAPRPoolp;
+        llassert_always(mFile) ;
-        apr_file_t* filep = ll_apr_file_open(filename, APR_READ|APR_BINARY, pool);
+        
-        if (!filep)
+        apr_size_t sz = nbytes;
+        apr_status_t s = apr_file_write(mFile, buf, &sz);
+        if (s != APR_SUCCESS)
        {
                return 0;
        }
-        S32 off;
-        if (offset < 0)
-                off = ll_apr_file_seek(filep, APR_END, 0);
        else
-                off = ll_apr_file_seek(filep, APR_SET, offset);
-        S32 bytes_read;
-        if (off < 0)
        {
-                bytes_read = 0;
+                llassert_always(sz <= 0x7fffffff);
+                return (S32)sz;
        }
-        else
+}
+S32 LLAPRFile::seek(apr_seek_where_t where, S32 offset)
+{
+        return LLAPRFile::seek(mFile, where, offset) ;
+}
+//
+//*******************************************************************************************************************************
+//static components of LLAPRFile
+//
+//static
+apr_status_t LLAPRFile::close(apr_file_t* file_handle, LLVolatileAPRPool* pool) 
+{
+        apr_status_t ret = APR_SUCCESS ;
+        if(file_handle)
+        {
+                ret = apr_file_close(file_handle);
+                file_handle = NULL ;
+        }
+        if(pool)
        {
-                bytes_read = ll_apr_file_read(filep, buf, nbytes );
+                pool->clearVolatileAPRPool() ;
        }
-        apr_file_close(filep);
-        return bytes_read;
+        return ret ;
 }
-S32 ll_apr_file_write(apr_file_t* apr_file, const void *buf, S32 nbytes)
+//static
+apr_file_t* LLAPRFile::open(const std::string& filename, LLVolatileAPRPool* pool, apr_int32_t flags)
 {
-        apr_size_t sz = nbytes;
+        apr_status_t s;
-        apr_status_t s = apr_file_write(apr_file, buf, &sz);
+        apr_file_t* file_handle ;
+        pool = pool ? pool : LLAPRFile::sAPRFilePoolp ;
+        s = apr_file_open(&file_handle, filename.c_str(), flags, APR_OS_DEFAULT, pool->getVolatileAPRPool());
+        if (s != APR_SUCCESS || !file_handle)
+        {
+                file_handle = NULL ;
+                close(file_handle, pool) ;
+                return NULL;
+        }
+        return file_handle ;
+}
+//static
+S32 LLAPRFile::seek(apr_file_t* file_handle, apr_seek_where_t where, S32 offset)
+{
+        if(!file_handle)
+        {
+                return -1 ;
+        }
+        apr_status_t s;
+        apr_off_t apr_offset;
+        if (offset >= 0)
+        {
+                apr_offset = (apr_off_t)offset;
+                s = apr_file_seek(file_handle, where, &apr_offset);
+        }
+        else
+        {
+                apr_offset = 0;
+                s = apr_file_seek(file_handle, APR_END, &apr_offset);
+        }
        if (s != APR_SUCCESS)
        {
+                return -1;
+        }
+        else
+        {
+                llassert_always(apr_offset <= 0x7fffffff);
+                return (S32)apr_offset;
+        }
+}
+//static
+S32 LLAPRFile::readEx(const std::string& filename, void *buf, S32 offset, S32 nbytes, LLVolatileAPRPool* pool)
+{
+        //*****************************************
+        apr_file_t* file_handle = open(filename, pool, APR_READ|APR_BINARY); 
+        //*****************************************     
+        if (!file_handle)
+        {
                return 0;
        }
+        S32 off;
+        if (offset < 0)
+                off = LLAPRFile::seek(file_handle, APR_END, 0);
+        else
+                off = LLAPRFile::seek(file_handle, APR_SET, offset);
+        
+        apr_size_t bytes_read;
+        if (off < 0)
+        {
+                bytes_read = 0;
+        }
        else
        {
-                llassert_always(sz <= 0x7fffffff);
+                bytes_read = nbytes ;           
-                return (S32)sz;
+                apr_status_t s = apr_file_read(file_handle, buf, &bytes_read);
+                if (s != APR_SUCCESS)
+                {
+                        bytes_read = 0;
+                }
+                else
+                {
+                        llassert_always(bytes_read <= 0x7fffffff);              
+                }
        }
+        
+        //*****************************************
+        close(file_handle, pool) ; 
+        //*****************************************
+        return (S32)bytes_read;
 }
-S32 ll_apr_file_write_ex(const std::string& filename, apr_pool_t* pool, void *buf, S32 offset, S32 nbytes)
+//static
+S32 LLAPRFile::writeEx(const std::string& filename, void *buf, S32 offset, S32 nbytes, LLVolatileAPRPool* pool)
 {
-        if (pool == NULL) pool = gAPRPoolp;
        apr_int32_t flags = APR_CREATE|APR_WRITE|APR_BINARY;
        if (offset < 0)
        {
                flags |= APR_APPEND;
                offset = 0;
        }
-        apr_file_t* filep = ll_apr_file_open(filename, flags, pool);
+        
-        if (!filep)
+        //*****************************************
+        apr_file_t* file_handle = open(filename, pool, flags);
+        //*****************************************
+        if (!file_handle)
        {
                return 0;
        }
        if (offset > 0)
        {
-                offset = ll_apr_file_seek(filep, APR_SET, offset);
+                offset = LLAPRFile::seek(file_handle, APR_SET, offset);
        }
-        S32 bytes_written;
+        
+        apr_size_t bytes_written;
        if (offset < 0)
        {
                bytes_written = 0;
        }
        else
        {
-                bytes_written = ll_apr_file_write(filep, buf, nbytes );
+                bytes_written = nbytes ;                
+                apr_status_t s = apr_file_write(file_handle, buf, &bytes_written);
+                if (s != APR_SUCCESS)
+                {
+                        bytes_written = 0;
+                }
+                else
+                {
+                        llassert_always(bytes_written <= 0x7fffffff);
+                }
        }
-        apr_file_close(filep);
-        return bytes_written;
+        //*****************************************
-}
+        LLAPRFile::close(file_handle, pool);
+        //*****************************************
-S32 ll_apr_file_seek(apr_file_t* apr_file, apr_seek_where_t where, S32 offset)
+        return (S32)bytes_written;
-{
-        apr_status_t s;
-        apr_off_t apr_offset;
-        if (offset >= 0)
-        {
-                apr_offset = (apr_off_t)offset;
-                s = apr_file_seek(apr_file, where, &apr_offset);
-        }
-        else
-        {
-                apr_offset = 0;
-                s = apr_file_seek(apr_file, APR_END, &apr_offset);
-        }
-        if (s != APR_SUCCESS)
-        {
-                return -1;
-        }
-        else
-        {
-                llassert_always(apr_offset <= 0x7fffffff);
-                return (S32)apr_offset;
-        }
 }
-bool ll_apr_file_remove(const std::string& filename, apr_pool_t* pool)
+//static
+bool LLAPRFile::remove(const std::string& filename, LLVolatileAPRPool* pool)
 {
        apr_status_t s;
-        if (pool == NULL) pool = gAPRPoolp;
-        s = apr_file_remove(filename.c_str(), pool);
+        pool = pool ? pool : LLAPRFile::sAPRFilePoolp ;
+        s = apr_file_remove(filename.c_str(), pool->getVolatileAPRPool());
+        pool->clearVolatileAPRPool() ;
        if (s != APR_SUCCESS)
        {
-                LL_DEBUGS("APR") << "ll_apr_file_remove failed on file: " << filename << LL_ENDL;
+                LL_DEBUGS("APR") << "LLAPRFile::remove failed on file: " << filename << LL_ENDL;
                ll_apr_warn_status(s);
                return false;
        }
        return true;
 }
-bool ll_apr_file_rename(const std::string& filename, const std::string& newname, apr_pool_t* pool)
+//static
+bool LLAPRFile::rename(const std::string& filename, const std::string& newname, LLVolatileAPRPool* pool)
 {
        apr_status_t s;
-        if (pool == NULL) pool = gAPRPoolp;
-        s = apr_file_rename(filename.c_str(), newname.c_str(), pool);
+        pool = pool ? pool : LLAPRFile::sAPRFilePoolp ;
+        s = apr_file_rename(filename.c_str(), newname.c_str(), pool->getVolatileAPRPool());
+        pool->clearVolatileAPRPool() ;
+        
        if (s != APR_SUCCESS)
        {
-                LL_DEBUGS("APR") << "ll_apr_file_rename failed on file: " << filename << LL_ENDL;
+                LL_DEBUGS("APR") << "LLAPRFile::rename failed on file: " << filename << LL_ENDL;
                ll_apr_warn_status(s);
                return false;
        }
        return true;
 }
-bool ll_apr_file_exists(const std::string& filename, apr_pool_t* pool)
+//static
+bool LLAPRFile::isExist(const std::string& filename, LLVolatileAPRPool* pool, apr_int32_t flags)
 {
        apr_file_t* apr_file;
        apr_status_t s;
-        if (pool == NULL) pool = gAPRPoolp;
-        s = apr_file_open(&apr_file, filename.c_str(), APR_READ, APR_OS_DEFAULT, pool);
+        pool = pool ? pool : LLAPRFile::sAPRFilePoolp ;
+        s = apr_file_open(&apr_file, filename.c_str(), flags, APR_OS_DEFAULT, pool->getVolatileAPRPool());      
        if (s != APR_SUCCESS || !apr_file)
        {
+                pool->clearVolatileAPRPool() ;
                return false;
        }
        else
        {
-                apr_file_close(apr_file);
+                apr_file_close(apr_file) ;
+                pool->clearVolatileAPRPool() ;
                return true;
        }
 }
-S32 ll_apr_file_size(const std::string& filename, apr_pool_t* pool)
+//static
+S32 LLAPRFile::size(const std::string& filename, LLVolatileAPRPool* pool)
 {
        apr_file_t* apr_file;
        apr_finfo_t info;
        apr_status_t s;
-        if (pool == NULL) pool = gAPRPoolp;
+        
-        s = apr_file_open(&apr_file, filename.c_str(), APR_READ, APR_OS_DEFAULT, pool);
+        pool = pool ? pool : LLAPRFile::sAPRFilePoolp ;
+        s = apr_file_open(&apr_file, filename.c_str(), APR_READ, APR_OS_DEFAULT, pool->getVolatileAPRPool());
+        
        if (s != APR_SUCCESS || !apr_file)
-        {
+        {               
+                pool->clearVolatileAPRPool() ;
+                
                return 0;
        }
        else
        {
-                apr_status_t s = apr_file_info_get(&info, APR_FINFO_SIZE, apr_file);
+                apr_status_t s = apr_file_info_get(&info, APR_FINFO_SIZE, apr_file);            
-                apr_file_close(apr_file);
+                apr_file_close(apr_file) ;
+                pool->clearVolatileAPRPool() ;
+                
                if (s == APR_SUCCESS)
                {
                        return (S32)info.size;
@@ -380,31 +656,42 @@ S32 ll_apr_file_size(const std::string& filename, apr_pool_t* pool)
        }
 }
-bool ll_apr_dir_make(const std::string& dirname, apr_pool_t* pool)
+//static
+bool LLAPRFile::makeDir(const std::string& dirname, LLVolatileAPRPool* pool)
 {
        apr_status_t s;
-        if (pool == NULL) pool = gAPRPoolp;
-        s = apr_dir_make(dirname.c_str(), APR_FPROT_OS_DEFAULT, pool);
+        pool = pool ? pool : LLAPRFile::sAPRFilePoolp ;
+        s = apr_dir_make(dirname.c_str(), APR_FPROT_OS_DEFAULT, pool->getVolatileAPRPool());
+        pool->clearVolatileAPRPool() ;
+                
        if (s != APR_SUCCESS)
        {
-                LL_DEBUGS("APR") << "ll_apr_dir_make failed on file: " << dirname << LL_ENDL;
+                LL_DEBUGS("APR") << "LLAPRFile::makeDir failed on file: " << dirname << LL_ENDL;
                ll_apr_warn_status(s);
                return false;
        }
        return true;
 }
-bool ll_apr_dir_remove(const std::string& dirname, apr_pool_t* pool)
+//static
+bool LLAPRFile::removeDir(const std::string& dirname, LLVolatileAPRPool* pool)
 {
        apr_status_t s;
-        if (pool == NULL) pool = gAPRPoolp;
-        s = apr_file_remove(dirname.c_str(), pool);
+        pool = pool ? pool : LLAPRFile::sAPRFilePoolp ;
+        s = apr_file_remove(dirname.c_str(), pool->getVolatileAPRPool());
+        pool->clearVolatileAPRPool() ;
+        
        if (s != APR_SUCCESS)
        {
-                LL_DEBUGS("APR") << "ll_apr_dir_remove failed on file: " << dirname << LL_ENDL;
+                LL_DEBUGS("APR") << "LLAPRFile::removeDir failed on file: " << dirname << LL_ENDL;
                ll_apr_warn_status(s);
                return false;
        }
        return true;
 }
+//
+//end of static components of LLAPRFile
+//*******************************************************************************************************************************
+//
diff --git a/linden/indra/llcommon/llapr.h b/linden/indra/llcommon/llapr.h
index a80c1d6..63130a8 100644
--- a/linden/indra/llcommon/llapr.h
+++ b/linden/indra/llcommon/llapr.h
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -48,6 +49,7 @@
 #include "llstring.h"
 extern apr_thread_mutex_t* gLogMutexp;
+extern apr_thread_mutex_t* gCallStacksLogMutexp;
 /** 
 * @brief initialize the common apr constructs -- apr itself, the
@@ -60,18 +62,51 @@ void ll_init_apr();
 */
 void ll_cleanup_apr();
+//
+//LL apr_pool
+//manage apr_pool_t, destroy allocated apr_pool in the destruction function.
+//
 class LLAPRPool
 {
 public:
-        LLAPRPool(apr_pool_t *parent = NULL, apr_size_t size = 0) ;
+        LLAPRPool(apr_pool_t *parent = NULL, apr_size_t size = 0, BOOL releasePoolFlag = TRUE) ;
        ~LLAPRPool() ;
-        apr_pool_t* getAPRPool() {return mPool ; }
+        apr_pool_t* getAPRPool() ;
        apr_status_t getStatus() {return mStatus ; }
+protected:
+        void releaseAPRPool() ;
+        void createAPRPool() ;
+protected:
+        apr_pool_t*  mPool ;              //pointing to an apr_pool
+        apr_pool_t*  mParent ;                    //parent pool
+        apr_size_t   mMaxSize ;           //max size of mPool, mPool should return memory to system if allocated memory beyond this limit. However it seems not to work.
+        apr_status_t mStatus ;            //status when creating the pool
+        BOOL         mReleasePoolFlag ;   //if set, mPool is destroyed when LLAPRPool is deleted. default value is true.
+};
+//
+//volatile LL apr_pool
+//which clears memory automatically.
+//so it can not hold static data or data after memory is cleared
+//
+class LLVolatileAPRPool : public LLAPRPool
+{
+public:
+        LLVolatileAPRPool(apr_pool_t *parent = NULL, apr_size_t size = 0, BOOL releasePoolFlag = TRUE);
+        ~LLVolatileAPRPool(){}
+        apr_pool_t* getVolatileAPRPool() ;
+        
+        void        clearVolatileAPRPool() ;
+        BOOL        isFull() ;
+        BOOL        isEmpty() {return !mNumActiveRef ;}
 private:
-        apr_pool_t*  mPool ;
+        S32 mNumActiveRef ; //number of active pointers pointing to the apr_pool.
-        apr_status_t mStatus ;
+        S32 mNumTotalRef ;  //number of total pointers pointing to the apr_pool since last creating.   
 } ;
 /** 
@@ -144,24 +179,71 @@ typedef LLAtomic32<S32> LLAtomicS32;
 #define LL_APR_WB (APR_CREATE|APR_TRUNCATE|APR_WRITE|APR_BINARY) // "wb"
 #define LL_APR_RPB (APR_READ|APR_WRITE|APR_BINARY) // "r+b"
 #define LL_APR_WPB (APR_CREATE|APR_TRUNCATE|APR_READ|APR_WRITE|APR_BINARY) // "w+b"
-apr_file_t* ll_apr_file_open(const std::string& filename, apr_int32_t flags, S32* sizep, apr_pool_t* pool);
-apr_file_t* ll_apr_file_open(const std::string& filename, apr_int32_t flags, S32* sizep);
+//
-apr_file_t* ll_apr_file_open(const std::string& filename, apr_int32_t flags, apr_pool_t* pool);
+//apr_file manager
-apr_file_t* ll_apr_file_open(const std::string& filename, apr_int32_t flags);
+//which: 1)only keeps one file open;
-// Returns actual offset, -1 if seek fails
+//       2)closes the open file in the destruction function
-S32 ll_apr_file_seek(apr_file_t* apr_file, apr_seek_where_t where, S32 offset);
+//       3)informs the apr_pool to clean the memory when the file is closed.
-// Returns bytes read/written, 0 if read/write fails:
+//Note: please close an open file at the earliest convenience. 
-S32 ll_apr_file_read(apr_file_t* apr_file, void* buf, S32 nbytes);
+//      especially do not put some time-costly operations between open() and close().
-S32 ll_apr_file_read_ex(const std::string& filename, apr_pool_t* pool, void *buf, S32 offset, S32 nbytes);
+//      otherwise it might lock the APRFilePool.
-S32 ll_apr_file_write(apr_file_t* apr_file, const void* buf, S32 nbytes);
+//there are two different apr_pools the APRFile can use:
-S32 ll_apr_file_write_ex(const std::string& filename, apr_pool_t* pool, void *buf, S32 offset, S32 nbytes);
+//      1, a temperary pool passed to an APRFile function, which is used within this function and only once.
-// returns false if failure:
+//      2, a global pool.
-bool ll_apr_file_remove(const std::string& filename, apr_pool_t* pool = NULL);
+//
-bool ll_apr_file_rename(const std::string& filename, const std::string& newname, apr_pool_t* pool = NULL);
+class LLAPRFile
-bool ll_apr_file_exists(const std::string& filename, apr_pool_t* pool = NULL);
+{
-S32 ll_apr_file_size(const std::string& filename, apr_pool_t* pool = NULL);
+private:
-bool ll_apr_dir_make(const std::string& dirname, apr_pool_t* pool = NULL);
+        apr_file_t* mFile ;
-bool ll_apr_dir_remove(const std::string& dirname, apr_pool_t* pool = NULL);
+        LLVolatileAPRPool *mCurrentFilePoolp ; //currently in use apr_pool, could be one of them: sAPRFilePoolp, or a temp pool. 
+public:
+        LLAPRFile() ;
+        ~LLAPRFile() ;
+        apr_status_t open(LLVolatileAPRPool* pool, const std::string& filename, apr_int32_t flags, S32* sizep = NULL);
+        apr_status_t open(const std::string& filename, apr_int32_t flags, apr_pool_t* pool = NULL, S32* sizep = NULL);
+        apr_status_t close() ;
+        // Returns actual offset, -1 if seek fails
+        S32 seek(apr_seek_where_t where, S32 offset);
+        apr_status_t eof() { return apr_file_eof(mFile);}
+        // Returns bytes read/written, 0 if read/write fails:
+        S32 read(void* buf, S32 nbytes);
+        S32 write(const void* buf, S32 nbytes);
+        
+        apr_file_t* getFileHandle() {return mFile;}     
+private:
+        apr_pool_t* getAPRFilePool(apr_pool_t* pool) ;
+//
+//*******************************************************************************************************************************
+//static components
+//
+public:
+        static LLVolatileAPRPool *sAPRFilePoolp ; //a global apr_pool for APRFile, which is used only when local pool does not exist.
+private:
+        static apr_file_t* open(const std::string& filename, LLVolatileAPRPool* pool, apr_int32_t flags);
+        static apr_status_t close(apr_file_t* file, LLVolatileAPRPool* pool) ;
+        static S32 seek(apr_file_t* file, apr_seek_where_t where, S32 offset);
+public:
+        // returns false if failure:
+        static bool remove(const std::string& filename, LLVolatileAPRPool* pool = NULL);
+        static bool rename(const std::string& filename, const std::string& newname, LLVolatileAPRPool* pool = NULL);
+        static bool isExist(const std::string& filename, LLVolatileAPRPool* pool = NULL, apr_int32_t flags = APR_READ);
+        static S32 size(const std::string& filename, LLVolatileAPRPool* pool = NULL);
+        static bool makeDir(const std::string& dirname, LLVolatileAPRPool* pool = NULL);
+        static bool removeDir(const std::string& dirname, LLVolatileAPRPool* pool = NULL);
+        // Returns bytes read/written, 0 if read/write fails:
+        static S32 readEx(const std::string& filename, void *buf, S32 offset, S32 nbytes, LLVolatileAPRPool* pool = NULL);      
+        static S32 writeEx(const std::string& filename, void *buf, S32 offset, S32 nbytes, LLVolatileAPRPool* pool = NULL);     
+//*******************************************************************************************************************************
+};
 /**
 * @brief Function which approprately logs error or remains quiet on
diff --git a/linden/indra/llcommon/llassettype.cpp b/linden/indra/llcommon/llassettype.cpp
index 33e23e8..cf3bf89 100644
--- a/linden/indra/llcommon/llassettype.cpp
+++ b/linden/indra/llcommon/llassettype.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llassettype.h b/linden/indra/llcommon/llassettype.h
index 35b993d..4077b8d 100644
--- a/linden/indra/llcommon/llassettype.h
+++ b/linden/indra/llcommon/llassettype.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llassoclist.h b/linden/indra/llcommon/llassoclist.h
index 722d29f..5aa26ea 100644
--- a/linden/indra/llcommon/llassoclist.h
+++ b/linden/indra/llcommon/llassoclist.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llavatarconstants.h b/linden/indra/llcommon/llavatarconstants.h
index 1b385b8..6517b70 100644
--- a/linden/indra/llcommon/llavatarconstants.h
+++ b/linden/indra/llcommon/llavatarconstants.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llbase32.cpp b/linden/indra/llcommon/llbase32.cpp
index 79f560f..5e6ced9 100644
--- a/linden/indra/llcommon/llbase32.cpp
+++ b/linden/indra/llcommon/llbase32.cpp
@@ -22,7 +22,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -145,8 +146,6 @@ base32_encode(char *dst, size_t size, const void *data, size_t len)
 /* *TODO: Implement base32 encode.
-#define ARRAY_LEN(a) (sizeof (a) / sizeof((a)[0]))
 static inline int
 ascii_toupper(int c)
 {
@@ -172,7 +171,7 @@ base32_decode(char *dst, size_t size, const void *data, size_t len)
  unsigned max_pad = 3;
  if (0 == base32_map[0]) {
-    for (i = 0; i < ARRAY_LEN(base32_map); i++) {
+    for (i = 0; i < LL_ARRAY_SIZE(base32_map); i++) {
      const char *x;
      
      x = memchr(base32_alphabet, ascii_toupper(i), sizeof base32_alphabet);
@@ -196,7 +195,7 @@ base32_decode(char *dst, size_t size, const void *data, size_t len)
      }
    }
-    j = i % ARRAY_LEN(s);
+    j = i % LL_ARRAY_SIZE(s);
    s[j] = c;
    if (7 == j) {
@@ -208,7 +207,7 @@ base32_decode(char *dst, size_t size, const void *data, size_t len)
      b[3] = ((s[4] & 1) << 7) | ((s[5] & 0x1f) << 2) | ((s[6] >> 3) & 0x03);
      b[4] = ((s[6] & 0x07) << 5) | (s[7] & 0x1f);
-      for (j = 0; j < ARRAY_LEN(b); j++) {
+      for (j = 0; j < LL_ARRAY_SIZE(b); j++) {
        if (q != end)
          *q = b[j];
        q++;
diff --git a/linden/indra/llcommon/llbase32.h b/linden/indra/llcommon/llbase32.h
index 667d8eb..63a93e1 100644
--- a/linden/indra/llcommon/llbase32.h
+++ b/linden/indra/llcommon/llbase32.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llbase64.cpp b/linden/indra/llcommon/llbase64.cpp
index 304fd08..7020a79 100644
--- a/linden/indra/llcommon/llbase64.cpp
+++ b/linden/indra/llcommon/llbase64.cpp
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llbase64.h b/linden/indra/llcommon/llbase64.h
index 24c3f3e..58414bb 100644
--- a/linden/indra/llcommon/llbase64.h
+++ b/linden/indra/llcommon/llbase64.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llboost.h b/linden/indra/llcommon/llboost.h
index 9eb7cd7..4df9dbf 100644
--- a/linden/indra/llcommon/llboost.h
+++ b/linden/indra/llcommon/llboost.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llchat.h b/linden/indra/llcommon/llchat.h
index 1bb3f3b..7b010d6 100644
--- a/linden/indra/llcommon/llchat.h
+++ b/linden/indra/llcommon/llchat.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -77,7 +78,8 @@ public:
                mAudible(CHAT_AUDIBLE_FULLY),
                mMuted(FALSE),
                mTime(0.0),
-                mPosAgent()
+                mPosAgent(),
+                mURL()
        { }
        
        std::string             mText;          // UTF-8 line of text
@@ -89,6 +91,7 @@ public:
        BOOL                    mMuted;         // pass muted chat to maintain list of chatters
        F64                             mTime;          // viewer only, seconds from viewer start
        LLVector3               mPosAgent;
+        std::string             mURL;
 };
 #endif
diff --git a/linden/indra/llcommon/llclickaction.h b/linden/indra/llcommon/llclickaction.h
index 1193c32..8048724 100644
--- a/linden/indra/llcommon/llclickaction.h
+++ b/linden/indra/llcommon/llclickaction.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llcommon.cpp b/linden/indra/llcommon/llcommon.cpp
index 1875044..2cbb718 100644
--- a/linden/indra/llcommon/llcommon.cpp
+++ b/linden/indra/llcommon/llcommon.cpp
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llcommon.h b/linden/indra/llcommon/llcommon.h
index 0cb5c0e..5f77988 100644
--- a/linden/indra/llcommon/llcommon.h
+++ b/linden/indra/llcommon/llcommon.h
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llcrc.cpp b/linden/indra/llcommon/llcrc.cpp
index 593a385..7f183dc 100644
--- a/linden/indra/llcommon/llcrc.cpp
+++ b/linden/indra/llcommon/llcrc.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -196,6 +197,10 @@ void LLCRC::update(const std::string& filename)
                        update(data, nread);
                        delete[] data;
                }
+                else
+                {
+                        fclose(fp);
+                }
        }
 }
diff --git a/linden/indra/llcommon/llcrc.h b/linden/indra/llcommon/llcrc.h
index 3dd2b3f..27fae7d 100644
--- a/linden/indra/llcommon/llcrc.h
+++ b/linden/indra/llcommon/llcrc.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llcriticaldamp.cpp b/linden/indra/llcommon/llcriticaldamp.cpp
index cc0caed..b6f715b 100644
--- a/linden/indra/llcommon/llcriticaldamp.cpp
+++ b/linden/indra/llcommon/llcriticaldamp.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llcriticaldamp.h b/linden/indra/llcommon/llcriticaldamp.h
index 17659da..ad98284 100644
--- a/linden/indra/llcommon/llcriticaldamp.h
+++ b/linden/indra/llcommon/llcriticaldamp.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llcursortypes.cpp b/linden/indra/llcommon/llcursortypes.cpp
new file mode 100644
index 0000000..7444115
--- /dev/null
+++ b/linden/indra/llcommon/llcursortypes.cpp
@@ -0,0 +1,90 @@
+/** 
+ * @file llcursortypes.cpp
+ * @brief Cursor types and lookup of types from a string
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "llcursortypes.h"
+ECursorType getCursorFromString(const std::string& cursor_string)
+{
+        static std::map<std::string,U32> cursor_string_table;
+        if (cursor_string_table.empty())
+        {
+                cursor_string_table["UI_CURSOR_ARROW"] = UI_CURSOR_ARROW;
+                cursor_string_table["UI_CURSOR_WAIT"] = UI_CURSOR_WAIT;
+                cursor_string_table["UI_CURSOR_HAND"] = UI_CURSOR_HAND;
+                cursor_string_table["UI_CURSOR_IBEAM"] = UI_CURSOR_IBEAM;
+                cursor_string_table["UI_CURSOR_CROSS"] = UI_CURSOR_CROSS;
+                cursor_string_table["UI_CURSOR_SIZENWSE"] = UI_CURSOR_SIZENWSE;
+                cursor_string_table["UI_CURSOR_SIZENESW"] = UI_CURSOR_SIZENESW;
+                cursor_string_table["UI_CURSOR_SIZEWE"] = UI_CURSOR_SIZEWE;
+                cursor_string_table["UI_CURSOR_SIZENS"] = UI_CURSOR_SIZENS;
+                cursor_string_table["UI_CURSOR_NO"] = UI_CURSOR_NO;
+                cursor_string_table["UI_CURSOR_WORKING"] = UI_CURSOR_WORKING;
+                cursor_string_table["UI_CURSOR_TOOLGRAB"] = UI_CURSOR_TOOLGRAB;
+                cursor_string_table["UI_CURSOR_TOOLLAND"] = UI_CURSOR_TOOLLAND;
+                cursor_string_table["UI_CURSOR_TOOLFOCUS"] = UI_CURSOR_TOOLFOCUS;
+                cursor_string_table["UI_CURSOR_TOOLCREATE"] = UI_CURSOR_TOOLCREATE;
+                cursor_string_table["UI_CURSOR_ARROWDRAG"] = UI_CURSOR_ARROWDRAG;
+                cursor_string_table["UI_CURSOR_ARROWCOPY"] = UI_CURSOR_ARROWCOPY;
+                cursor_string_table["UI_CURSOR_ARROWDRAGMULTI"] = UI_CURSOR_ARROWDRAGMULTI;
+                cursor_string_table["UI_CURSOR_ARROWCOPYMULTI"] = UI_CURSOR_ARROWCOPYMULTI;
+                cursor_string_table["UI_CURSOR_NOLOCKED"] = UI_CURSOR_NOLOCKED;
+                cursor_string_table["UI_CURSOR_ARROWLOCKED"] = UI_CURSOR_ARROWLOCKED;
+                cursor_string_table["UI_CURSOR_GRABLOCKED"] = UI_CURSOR_GRABLOCKED;
+                cursor_string_table["UI_CURSOR_TOOLTRANSLATE"] = UI_CURSOR_TOOLTRANSLATE;
+                cursor_string_table["UI_CURSOR_TOOLROTATE"] = UI_CURSOR_TOOLROTATE;
+                cursor_string_table["UI_CURSOR_TOOLSCALE"] = UI_CURSOR_TOOLSCALE;
+                cursor_string_table["UI_CURSOR_TOOLCAMERA"] = UI_CURSOR_TOOLCAMERA;
+                cursor_string_table["UI_CURSOR_TOOLPAN"] = UI_CURSOR_TOOLPAN;
+                cursor_string_table["UI_CURSOR_TOOLZOOMIN"] = UI_CURSOR_TOOLZOOMIN;
+                cursor_string_table["UI_CURSOR_TOOLPICKOBJECT3"] = UI_CURSOR_TOOLPICKOBJECT3;
+                cursor_string_table["UI_CURSOR_TOOLSIT"] = UI_CURSOR_TOOLSIT;
+                cursor_string_table["UI_CURSOR_TOOLBUY"] = UI_CURSOR_TOOLBUY;
+                cursor_string_table["UI_CURSOR_TOOLPAY"] = UI_CURSOR_TOOLPAY;
+                cursor_string_table["UI_CURSOR_TOOLOPEN"] = UI_CURSOR_TOOLOPEN;
+                cursor_string_table["UI_CURSOR_TOOLPLAY"] = UI_CURSOR_TOOLPLAY;
+                cursor_string_table["UI_CURSOR_TOOLPAUSE"] = UI_CURSOR_TOOLPAUSE;
+                cursor_string_table["UI_CURSOR_TOOLMEDIAOPEN"] = UI_CURSOR_TOOLMEDIAOPEN;
+                cursor_string_table["UI_CURSOR_PIPETTE"] = UI_CURSOR_PIPETTE;
+        }
+        std::map<std::string,U32>::const_iterator iter = cursor_string_table.find(cursor_string);
+        
+        if (iter != cursor_string_table.end())
+        {
+                return (ECursorType)iter->second;
+        }
+        return UI_CURSOR_ARROW;
+}
diff --git a/linden/indra/llcommon/llcursortypes.h b/linden/indra/llcommon/llcursortypes.h
new file mode 100644
index 0000000..bea7035
--- /dev/null
+++ b/linden/indra/llcommon/llcursortypes.h
@@ -0,0 +1,82 @@
+/** 
+ * @file llcursortypes.h
+ * @brief Cursor types
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LL_LLCURSORTYPES_H
+#define LL_LLCURSORTYPES_H
+#include "linden_common.h"
+// If you add types here, add them in LLCursor::getCursorFromString
+enum ECursorType {
+        UI_CURSOR_ARROW,
+        UI_CURSOR_WAIT,
+        UI_CURSOR_HAND,
+        UI_CURSOR_IBEAM,
+        UI_CURSOR_CROSS,
+        UI_CURSOR_SIZENWSE,
+        UI_CURSOR_SIZENESW,
+        UI_CURSOR_SIZEWE,
+        UI_CURSOR_SIZENS,
+        UI_CURSOR_NO,
+        UI_CURSOR_WORKING,
+        UI_CURSOR_TOOLGRAB,
+        UI_CURSOR_TOOLLAND,
+        UI_CURSOR_TOOLFOCUS,
+        UI_CURSOR_TOOLCREATE,
+        UI_CURSOR_ARROWDRAG,
+        UI_CURSOR_ARROWCOPY,    // drag with copy
+        UI_CURSOR_ARROWDRAGMULTI,
+        UI_CURSOR_ARROWCOPYMULTI,       // drag with copy
+        UI_CURSOR_NOLOCKED,
+        UI_CURSOR_ARROWLOCKED,
+        UI_CURSOR_GRABLOCKED,
+        UI_CURSOR_TOOLTRANSLATE,
+        UI_CURSOR_TOOLROTATE,
+        UI_CURSOR_TOOLSCALE,
+        UI_CURSOR_TOOLCAMERA,
+        UI_CURSOR_TOOLPAN,
+        UI_CURSOR_TOOLZOOMIN,
+        UI_CURSOR_TOOLPICKOBJECT3,
+        UI_CURSOR_TOOLSIT,
+        UI_CURSOR_TOOLBUY,
+        UI_CURSOR_TOOLPAY,
+        UI_CURSOR_TOOLOPEN,
+        UI_CURSOR_TOOLPLAY,
+        UI_CURSOR_TOOLPAUSE,
+        UI_CURSOR_TOOLMEDIAOPEN,
+        UI_CURSOR_PIPETTE,
+        UI_CURSOR_COUNT                 // Number of elements in this enum (NOT a cursor)
+};
+ECursorType getCursorFromString(const std::string& cursor_string);
+#endif // LL_LLCURSORTYPES_H
diff --git a/linden/indra/llcommon/lldarray.h b/linden/indra/llcommon/lldarray.h
index 3b84aab..0e56a11 100644
--- a/linden/indra/llcommon/lldarray.h
+++ b/linden/indra/llcommon/lldarray.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/lldarrayptr.h b/linden/indra/llcommon/lldarrayptr.h
index 06336a7..7fde52b 100644
--- a/linden/indra/llcommon/lldarrayptr.h
+++ b/linden/indra/llcommon/lldarrayptr.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/lldate.cpp b/linden/indra/llcommon/lldate.cpp
index 512b3ee..41a3af3 100644
--- a/linden/indra/llcommon/lldate.cpp
+++ b/linden/indra/llcommon/lldate.cpp
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -36,9 +37,12 @@
 #include "apr_time.h"
+#include <time.h>
 #include <iomanip>
 #include <sstream>
+#include "lltimer.h"
 static const F64 DATE_EPOCH = 0.0;
 static const F64 LL_APR_USEC_PER_SEC = 1000000.0;
@@ -122,7 +126,7 @@ void LLDate::toHTTPDateStream(std::ostream& s) const
      << " GMT";
    // RFC 1123 date does not use microseconds
-    llinfos << "Date in RFC 1123 format is " << s << llendl;
+    //llinfos << "Date in RFC 1123 format is " << s << llendl;
 }
 void LLDate::toStream(std::ostream& s) const
@@ -234,6 +238,17 @@ void LLDate::secondsSinceEpoch(F64 seconds)
        mSecondsSinceEpoch = seconds;
 }
+/* static */ LLDate LLDate::now()
+{
+        // time() returns seconds, we want fractions of a second, which LLTimer provides --RN
+        return LLDate(LLTimer::getTotalSeconds());
+}
+bool LLDate::operator<(const LLDate& rhs) const
+{
+    return mSecondsSinceEpoch < rhs.mSecondsSinceEpoch;
+}
 std::ostream& operator<<(std::ostream& s, const LLDate& date)
 {
        date.toStream(s);
@@ -245,3 +260,4 @@ std::istream& operator>>(std::istream& s, LLDate& date)
        date.fromStream(s);
        return s;
 }
diff --git a/linden/indra/llcommon/lldate.h b/linden/indra/llcommon/lldate.h
index 7adf724..7cc9c8a 100644
--- a/linden/indra/llcommon/lldate.h
+++ b/linden/indra/llcommon/lldate.h
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -35,6 +36,7 @@
 #define LL_LLDATE_H
 #include <iosfwd>
+#include <string>
 #include "stdtypes.h"
@@ -53,7 +55,7 @@ public:
        LLDate();
        /** 
-         * @brief Construct a date equal to epoch.
+         * @brief Construct a date equal to the source date.
         */
        LLDate(const LLDate& date);
@@ -111,12 +113,45 @@ public:
         * @param seconds The number of seconds since epoch UTC.
         */
        void secondsSinceEpoch(F64 seconds);
+    
+    /**
+     * @brief Create an LLDate object set to the current time.
+         *
+         * @return The number of seconds since epoch UTC.
+         */
+    static LLDate now();
+        /** 
+         * @brief Compare dates using operator< so we can order them using STL.
+         *
+         * @param rhs -- the right hand side of the comparison operator
+         */
+        bool operator<(const LLDate& rhs) const;
+    
+        /** 
+         * @brief Remaining comparison operators in terms of operator<
+     * This conforms to the expectation of STL.
+         *
+         * @param rhs -- the right hand side of the comparison operator
+         */
+    bool operator>(const LLDate& rhs) const { return rhs < *this; }
+    bool operator<=(const LLDate& rhs) const { return !(rhs < *this); }
+    bool operator>=(const LLDate& rhs) const { return !(*this < rhs); }
+    bool operator!=(const LLDate& rhs) const { return (*this < rhs) || (rhs < *this); }
+    bool operator==(const LLDate& rhs) const { return !(*this != rhs); }
+        /**
+         * @brief Compare to epoch UTC.
+         */
+        bool isNull() const { return mSecondsSinceEpoch == 0.0; }
+        bool notNull() const { return mSecondsSinceEpoch != 0.0; }
+         
 private:
        F64 mSecondsSinceEpoch;
 };
 // Helper function to stream out a date
 std::ostream& operator<<(std::ostream& s, const LLDate& date);
diff --git a/linden/indra/llcommon/lldefs.h b/linden/indra/llcommon/lldefs.h
index c0ff00b..f3b5ca3 100644
--- a/linden/indra/llcommon/lldefs.h
+++ b/linden/indra/llcommon/lldefs.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/lldepthstack.h b/linden/indra/llcommon/lldepthstack.h
index c099f13..accc11f 100644
--- a/linden/indra/llcommon/lldepthstack.h
+++ b/linden/indra/llcommon/lldepthstack.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/lldlinked.h b/linden/indra/llcommon/lldlinked.h
index 0d8e812..8b68532 100644
--- a/linden/indra/llcommon/lldlinked.h
+++ b/linden/indra/llcommon/lldlinked.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/lldqueueptr.h b/linden/indra/llcommon/lldqueueptr.h
index eede159..77df47b 100644
--- a/linden/indra/llcommon/lldqueueptr.h
+++ b/linden/indra/llcommon/lldqueueptr.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llendianswizzle.h b/linden/indra/llcommon/llendianswizzle.h
index f119a5b..043d330 100644
--- a/linden/indra/llcommon/llendianswizzle.h
+++ b/linden/indra/llcommon/llendianswizzle.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llenum.h b/linden/indra/llcommon/llenum.h
index a93eb31..ac6d46b 100644
--- a/linden/indra/llcommon/llenum.h
+++ b/linden/indra/llcommon/llenum.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llerror.cpp b/linden/indra/llcommon/llerror.cpp
index cf4b341..30b61a9 100644
--- a/linden/indra/llcommon/llerror.cpp
+++ b/linden/indra/llcommon/llerror.cpp
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -987,6 +988,38 @@ namespace LLError
                
                return new std::ostringstream;
        }
+        
+        void Log::flush(std::ostringstream* out, char* message)
+    {
+       LogLock lock;
+       if (!lock.ok())
+       {
+           return;
+       }
+       
+           if(strlen(out->str().c_str()) < 128)
+           {
+                   strcpy(message, out->str().c_str());
+           }
+           else
+           {
+                   strncpy(message, out->str().c_str(), 127);
+                   message[127] = '\0' ;
+           }
+           
+           Globals& g = Globals::get();
+       if (out == &g.messageStream)
+       {
+           g.messageStream.clear();
+           g.messageStream.str("");
+           g.messageStreamInUse = false;
+       }
+       else
+       {
+           delete out;
+       }
+           return ;
+    }
        void Log::flush(std::ostringstream* out, const CallSite& site)
        {
@@ -1202,3 +1235,159 @@ namespace LLError
        }
 }
+namespace LLError
+{     
+        char** LLCallStacks::sBuffer = NULL ;
+        S32    LLCallStacks::sIndex  = 0 ;
+        class CallStacksLogLock
+        {
+        public:
+                CallStacksLogLock();
+                ~CallStacksLogLock();
+                bool ok() const { return mOK; }
+        private:
+                bool mLocked;
+                bool mOK;
+        };
+        
+        CallStacksLogLock::CallStacksLogLock()
+                : mLocked(false), mOK(false)
+        {
+                if (!gCallStacksLogMutexp)
+                {
+                        mOK = true;
+                        return;
+                }
+                
+                const int MAX_RETRIES = 5;
+                for (int attempts = 0; attempts < MAX_RETRIES; ++attempts)
+                {
+                        apr_status_t s = apr_thread_mutex_trylock(gCallStacksLogMutexp);
+                        if (!APR_STATUS_IS_EBUSY(s))
+                        {
+                                mLocked = true;
+                                mOK = true;
+                                return;
+                        }
+                        ms_sleep(1);
+                }
+                // We're hosed, we can't get the mutex.  Blah.
+                std::cerr << "CallStacksLogLock::CallStacksLogLock: failed to get mutex for log"
+                                        << std::endl;
+        }
+        
+        CallStacksLogLock::~CallStacksLogLock()
+        {
+                if (mLocked)
+                {
+                        apr_thread_mutex_unlock(gCallStacksLogMutexp);
+                }
+        }
+        //static
+   void LLCallStacks::push(const char* function, const int line)
+   {
+           CallStacksLogLock lock;
+       if (!lock.ok())
+       {
+           return;
+       }
+           if(!sBuffer)
+           {
+                   sBuffer = new char*[512] ;
+                   sBuffer[0] = new char[512 * 128] ;
+                   for(S32 i = 1 ; i < 512 ; i++)
+                   {
+                           sBuffer[i] = sBuffer[i-1] + 128 ;
+                   }
+                   sIndex = 0 ;
+           }
+           if(sIndex > 511)
+           {
+                   clear() ;
+           }
+           strcpy(sBuffer[sIndex], function) ;
+           sprintf(sBuffer[sIndex] + strlen(function), " line: %d ", line) ;
+           sIndex++ ;
+           return ;
+   }
+        //static
+   std::ostringstream* LLCallStacks::insert(const char* function, const int line)
+   {
+       std::ostringstream* _out = LLError::Log::out();
+           *_out << function << " line " << line << " " ;
+             
+           return _out ;
+   }
+   //static
+   void LLCallStacks::end(std::ostringstream* _out)
+   {
+           CallStacksLogLock lock;
+       if (!lock.ok())
+       {
+           return;
+       }
+           if(!sBuffer)
+           {
+                   sBuffer = new char*[512] ;
+                   sBuffer[0] = new char[512 * 128] ;
+                   for(S32 i = 1 ; i < 512 ; i++)
+                   {
+                           sBuffer[i] = sBuffer[i-1] + 128 ;
+                   }
+                   sIndex = 0 ;
+           }
+           if(sIndex > 511)
+           {
+                   clear() ;
+           }
+           LLError::Log::flush(_out, sBuffer[sIndex++]) ;          
+   }
+   //static
+   void LLCallStacks::print()
+   {
+           CallStacksLogLock lock;
+       if (!lock.ok())
+       {
+           return;
+       }
+       if(sIndex > 0)
+       {
+           llinfos << " ************* PRINT OUT LL CALL STACKS ************* " << llendl ;
+           while(sIndex > 0)
+           {                  
+                           sIndex-- ;
+               llinfos << sBuffer[sIndex] << llendl ;
+           }
+           llinfos << " *************** END OF LL CALL STACKS *************** " << llendl ;
+       }
+           if(sBuffer)
+           {
+                   delete[] sBuffer[0] ;
+                   delete[] sBuffer ;
+                   sBuffer = NULL ;
+           }
+   }
+   //static
+   void LLCallStacks::clear()
+   {
+       sIndex = 0 ;
+   }
+}
diff --git a/linden/indra/llcommon/llerror.h b/linden/indra/llcommon/llerror.h
index 211f89f..6794be4 100644
--- a/linden/indra/llcommon/llerror.h
+++ b/linden/indra/llcommon/llerror.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -37,6 +38,7 @@
 #include <typeinfo>
 #include "llerrorlegacy.h"
+#include "stdtypes.h"
 /* Error Logging Facility
@@ -134,6 +136,7 @@ namespace LLError
        public:
                static bool shouldLog(CallSite&);
                static std::ostringstream* out();
+                static void flush(std::ostringstream* out, char* message)  ;
                static void flush(std::ostringstream*, const CallSite&);
        };
        
@@ -178,9 +181,41 @@ namespace LLError
                
        class NoClassInfo { };
                // used to indicate no class info known for logging
-}
+   //LLCallStacks keeps track of call stacks and output the call stacks to log file
+   //when LLAppViewer::handleViewerCrash() is triggered.
+   //
+   //Note: to be simple, efficient and necessary to keep track of correct call stacks, 
+        //LLCallStacks is designed not to be thread-safe.
+   //so try not to use it in multiple parallel threads at same time.
+   //Used in a single thread at a time is fine.
+   class LLCallStacks
+   {
+   private:
+       static char**  sBuffer ;
+           static S32     sIndex ;
+          
+   public:   
+           static void push(const char* function, const int line) ;
+           static std::ostringstream* insert(const char* function, const int line) ;
+       static void print() ;
+       static void clear() ;
+           static void end(std::ostringstream* _out) ;
+   }; 
+}
+//this is cheaper than llcallstacks if no need to output other variables to call stacks. 
+#define llpushcallstacks LLError::LLCallStacks::push(__FUNCTION__, __LINE__)
+#define llcallstacks \
+        {\
+       std::ostringstream* _out = LLError::LLCallStacks::insert(__FUNCTION__, __LINE__) ; \
+       (*_out)
+#define llcallstacksendl \
+                LLError::End(); \
+                LLError::LLCallStacks::end(_out) ; \
+        }
+#define llclearcallstacks LLError::LLCallStacks::clear()
+#define llprintcallstacks LLError::LLCallStacks::print() 
 /*
        Class type information for logging
diff --git a/linden/indra/llcommon/llerrorcontrol.h b/linden/indra/llcommon/llerrorcontrol.h
index 9888444..a55d706 100644
--- a/linden/indra/llcommon/llerrorcontrol.h
+++ b/linden/indra/llcommon/llerrorcontrol.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llerrorlegacy.h b/linden/indra/llcommon/llerrorlegacy.h
index 71cec83..143fe20 100644
--- a/linden/indra/llcommon/llerrorlegacy.h
+++ b/linden/indra/llcommon/llerrorlegacy.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -52,6 +53,7 @@ const int LL_ERR_FILE_NOT_FOUND = -43;
 const int LL_ERR_FILE_EMPTY     = -44;
 const int LL_ERR_TCP_TIMEOUT    = -23016;
 const int LL_ERR_CIRCUIT_GONE   = -23017;
+const int LL_ERR_PRICE_MISMATCH = -23018;
diff --git a/linden/indra/llcommon/llerrorthread.cpp b/linden/indra/llcommon/llerrorthread.cpp
index d3e522d..4c779c5 100644
--- a/linden/indra/llcommon/llerrorthread.cpp
+++ b/linden/indra/llcommon/llerrorthread.cpp
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llerrorthread.h b/linden/indra/llcommon/llerrorthread.h
index 56d2a23..f1d6ffc 100644
--- a/linden/indra/llcommon/llerrorthread.h
+++ b/linden/indra/llcommon/llerrorthread.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llevent.cpp b/linden/indra/llcommon/llevent.cpp
index 8b81837..24be6e8 100644
--- a/linden/indra/llcommon/llevent.cpp
+++ b/linden/indra/llcommon/llevent.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llevent.h b/linden/indra/llcommon/llevent.h
index 3b20a61..60887a0 100644
--- a/linden/indra/llcommon/llevent.h
+++ b/linden/indra/llcommon/llevent.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/lleventemitter.h b/linden/indra/llcommon/lleventemitter.h
index e3f143b..2d15b01 100644
--- a/linden/indra/llcommon/lleventemitter.h
+++ b/linden/indra/llcommon/lleventemitter.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llextendedstatus.h b/linden/indra/llcommon/llextendedstatus.h
index 56cd872..4f954ff 100644
--- a/linden/indra/llcommon/llextendedstatus.h
+++ b/linden/indra/llcommon/llextendedstatus.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llfasttimer.cpp b/linden/indra/llcommon/llfasttimer.cpp
index 3304528..cdaadb0 100644
--- a/linden/indra/llcommon/llfasttimer.cpp
+++ b/linden/indra/llcommon/llfasttimer.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -48,6 +49,8 @@
 //////////////////////////////////////////////////////////////////////////////
 // statics
+LLFastTimer::EFastTimerType LLFastTimer::sCurType = LLFastTimer::FTM_OTHER;
 int LLFastTimer::sCurDepth = 0;
 U64 LLFastTimer::sStart[LLFastTimer::FTM_MAX_DEPTH];
 U64 LLFastTimer::sCounter[LLFastTimer::FTM_NUM_TYPES];
diff --git a/linden/indra/llcommon/llfasttimer.h b/linden/indra/llcommon/llfasttimer.h
index a32da18..94b5111 100644
--- a/linden/indra/llcommon/llfasttimer.h
+++ b/linden/indra/llcommon/llfasttimer.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -70,6 +71,14 @@ public:
                FTM_UPDATE_AVATAR,
                
                // common render components
+                FTM_SHADOW_GEOMETRY,
+                FTM_SHADOW_RENDER,
+                FTM_SHADOW_TERRAIN,
+                FTM_SHADOW_AVATAR,
+                FTM_SHADOW_SIMPLE,
+                FTM_SHADOW_ALPHA,
+                FTM_SHADOW_TREE,
+                
                FTM_RENDER_GEOMETRY,
                 FTM_RENDER_TERRAIN,
                 FTM_RENDER_SIMPLE,
@@ -185,11 +194,13 @@ public:
        enum { FTM_MAX_DEPTH = 64 };
        
 public:
+        static LLFastTimer::EFastTimerType sCurType;
        LLFastTimer(EFastTimerType type)
        {
 #if FAST_TIMER_ON
                mType = type;
+                sCurType = type;
                // These don't get counted, because they use CPU clockticks
                //gTimerBins[gCurTimerBin]++;
                //LLTimer::sNumTimerCalls++;
diff --git a/linden/indra/llcommon/llfile.cpp b/linden/indra/llcommon/llfile.cpp
index 7395d24..2a76f7f 100644
--- a/linden/indra/llcommon/llfile.cpp
+++ b/linden/indra/llcommon/llfile.cpp
@@ -20,7 +20,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llfile.h b/linden/indra/llcommon/llfile.h
index d0a0b8e..c6092f7 100644
--- a/linden/indra/llcommon/llfile.h
+++ b/linden/indra/llcommon/llfile.h
@@ -20,7 +20,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llfindlocale.cpp b/linden/indra/llcommon/llfindlocale.cpp
index c0d4aff..505f5c5 100644
--- a/linden/indra/llcommon/llfindlocale.cpp
+++ b/linden/indra/llcommon/llfindlocale.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -416,10 +417,8 @@ static const IDToCode primary_to_code[] = {
 /*{LANG_WALON,      "wa"},*/
  {LANG_CHINESE,    "zh"},
 };
-static int num_primary_to_code =
+static int num_primary_to_code = LL_ARRAY_SIZE(primary_to_code);
-  sizeof(primary_to_code) / sizeof(*primary_to_code);
+static int num_both_to_code = LL_ARRAY_SIZE(both_to_code);
-static int num_both_to_code =
-  sizeof(both_to_code) / sizeof(*both_to_code);
 static const int
 lcid_to_fl(LCID lcid,
diff --git a/linden/indra/llcommon/llfindlocale.h b/linden/indra/llcommon/llfindlocale.h
index 56ec976..f17c774 100644
--- a/linden/indra/llcommon/llfindlocale.h
+++ b/linden/indra/llcommon/llfindlocale.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llfixedbuffer.cpp b/linden/indra/llcommon/llfixedbuffer.cpp
index a819150..e9d6029 100644
--- a/linden/indra/llcommon/llfixedbuffer.cpp
+++ b/linden/indra/llcommon/llfixedbuffer.cpp
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -32,6 +33,7 @@
 #include "llfixedbuffer.h"
 LLFixedBuffer::LLFixedBuffer(const U32 max_lines)
+                          : mMutex(NULL)
 {
        mMaxLines = max_lines;
        mTimer.reset();
@@ -46,9 +48,11 @@ LLFixedBuffer::~LLFixedBuffer()
 void LLFixedBuffer::clear()
 {
+        mMutex.lock() ;
        mLines.clear();
        mAddTimes.clear();
        mLineLengths.clear();
+        mMutex.unlock() ;
        mTimer.reset();
 }
@@ -69,9 +73,11 @@ void LLFixedBuffer::addLine(const LLWString& line)
        removeExtraLines();
+        mMutex.lock() ;
        mLines.push_back(line);
        mLineLengths.push_back((S32)line.length());
        mAddTimes.push_back(mTimer.getElapsedTimeF32());
+        mMutex.unlock() ;
 }
@@ -85,10 +91,12 @@ void LLFixedBuffer::setMaxLines(S32 max_lines)
 void LLFixedBuffer::removeExtraLines()
 {
+        mMutex.lock() ;
        while ((S32)mLines.size() > llmax((S32)0, (S32)(mMaxLines - 1)))
        {
                mLines.pop_front();
                mAddTimes.pop_front();
                mLineLengths.pop_front();
        }
+        mMutex.unlock() ;
 }
diff --git a/linden/indra/llcommon/llfixedbuffer.h b/linden/indra/llcommon/llfixedbuffer.h
index dcd4dfb..992a024 100644
--- a/linden/indra/llcommon/llfixedbuffer.h
+++ b/linden/indra/llcommon/llfixedbuffer.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -36,6 +37,7 @@
 #include <deque>
 #include <string>
 #include "llstring.h"
+#include "llthread.h"
 // Fixed size buffer for console output and other things.
@@ -52,14 +54,19 @@ public:
        std::deque<S32>                 mLineLengths;
        void clear(); // Clear the buffer, and reset it.
-        virtual void addLine(const std::string& utf8line);
-        virtual void addLine(const LLWString& line);
+        //do not make these two "virtual"
+        void addLine(const std::string& utf8line);
+        void addLine(const LLWString& line);
        // Get lines currently in the buffer, up to max_size chars, max_length lines
        char *getLines(U32 max_size = 0, U32 max_length = 0); 
        void setMaxLines(S32 max_lines);
 protected:
        virtual void removeExtraLines();
+protected:
+        LLMutex mMutex ;
 };
 const U32 FIXED_BUF_MAX_LINE_LEN = 255; // Not including termnating 0
diff --git a/linden/indra/llcommon/llformat.cpp b/linden/indra/llcommon/llformat.cpp
index 4a9fce6..cf509be 100644
--- a/linden/indra/llcommon/llformat.cpp
+++ b/linden/indra/llcommon/llformat.cpp
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llformat.h b/linden/indra/llcommon/llformat.h
index a29afcc..44c62d9 100644
--- a/linden/indra/llcommon/llformat.h
+++ b/linden/indra/llcommon/llformat.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llframetimer.cpp b/linden/indra/llcommon/llframetimer.cpp
index aca1ec5..138c67a 100644
--- a/linden/indra/llcommon/llframetimer.cpp
+++ b/linden/indra/llcommon/llframetimer.cpp
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llframetimer.h b/linden/indra/llcommon/llframetimer.h
index fa88af6..8f51272 100644
--- a/linden/indra/llcommon/llframetimer.h
+++ b/linden/indra/llcommon/llframetimer.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llhash.h b/linden/indra/llcommon/llhash.h
index 0344d63..0ce1088 100644
--- a/linden/indra/llcommon/llhash.h
+++ b/linden/indra/llcommon/llhash.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -53,15 +54,20 @@
 #error Please define your platform.
 #endif
-template<class T> inline size_t llhash(T value) 
+// Warning - an earlier template-based version of this routine did not do
-{ 
+// the correct thing on Windows.   Since this is only used to get
+// a string hash, it was converted to a regular routine and
+// unit tests added.
+inline size_t llhash( const char * value )
+{
 #if LL_WINDOWS
-        return stdext::hash_value<T>(value);
+        return stdext::hash_value(value);
 #elif ( (defined _STLPORT_VERSION) || ((LL_LINUX) && (__GNUC__ <= 2)) )
-        std::hash<T> H;
+        std::hash<const char *> H;
        return H(value);
 #elif LL_DARWIN || LL_LINUX || LL_SOLARIS
-        __gnu_cxx::hash<T> H;
+        __gnu_cxx::hash<const char *> H;
        return H(value);
 #else
 #error Please define your platform.
diff --git a/linden/indra/llcommon/llheartbeat.cpp b/linden/indra/llcommon/llheartbeat.cpp
index 0777ac3..49c0ad5 100644
--- a/linden/indra/llcommon/llheartbeat.cpp
+++ b/linden/indra/llcommon/llheartbeat.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llheartbeat.h b/linden/indra/llcommon/llheartbeat.h
index 7cfdda6..fecb5b1 100644
--- a/linden/indra/llcommon/llheartbeat.h
+++ b/linden/indra/llcommon/llheartbeat.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llhttpstatuscodes.h b/linden/indra/llcommon/llhttpstatuscodes.h
index 9f625a0..83dde17 100644
--- a/linden/indra/llcommon/llhttpstatuscodes.h
+++ b/linden/indra/llcommon/llhttpstatuscodes.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llindexedqueue.h b/linden/indra/llcommon/llindexedqueue.h
index d41da6b..1b80e6e 100644
--- a/linden/indra/llcommon/llindexedqueue.h
+++ b/linden/indra/llcommon/llindexedqueue.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llindraconfigfile.cpp b/linden/indra/llcommon/llindraconfigfile.cpp
index d64bc8f..ca63e28 100644
--- a/linden/indra/llcommon/llindraconfigfile.cpp
+++ b/linden/indra/llcommon/llindraconfigfile.cpp
@@ -5,16 +5,27 @@
 * This class is an LLLiveFile that has config info for indra
 * Currently only whether it's blacklisted
 *
- * $LicenseInfo:firstyear=2007&license=internal$
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
 * 
 * Copyright (c) 2007-2009, Linden Research, Inc.
 * 
- * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * Second Life Viewer Source Code
- * this source code is governed by the Linden Lab Source Code Disclosure
+ * The source code in this file ("Source Code") is provided by Linden Lab
- * Agreement ("Agreement") previously entered between you and Linden
+ * to you under the terms of the GNU General Public License, version 2.0
- * Lab. By accessing, using, copying, modifying or distributing this
+ * ("GPL"), unless you have obtained a separate licensing agreement
- * software, you acknowledge that you have been informed of your
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * obligations under the Agreement and agree to abide by those obligations.
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
 * 
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
diff --git a/linden/indra/llcommon/llindraconfigfile.h b/linden/indra/llcommon/llindraconfigfile.h
index c426276..232e408 100644
--- a/linden/indra/llcommon/llindraconfigfile.h
+++ b/linden/indra/llcommon/llindraconfigfile.h
@@ -2,16 +2,27 @@
 * @file llindraconfigfile.h
 * @brief manages  configuration file for indra.xml
 *
- * $LicenseInfo:firstyear=2007&license=internal$
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
 * 
 * Copyright (c) 2007-2009, Linden Research, Inc.
 * 
- * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * Second Life Viewer Source Code
- * this source code is governed by the Linden Lab Source Code Disclosure
+ * The source code in this file ("Source Code") is provided by Linden Lab
- * Agreement ("Agreement") previously entered between you and Linden
+ * to you under the terms of the GNU General Public License, version 2.0
- * Lab. By accessing, using, copying, modifying or distributing this
+ * ("GPL"), unless you have obtained a separate licensing agreement
- * software, you acknowledge that you have been informed of your
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * obligations under the Agreement and agree to abide by those obligations.
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
 * 
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
diff --git a/linden/indra/llcommon/llkeythrottle.h b/linden/indra/llcommon/llkeythrottle.h
index 3b5e595..873f50a 100644
--- a/linden/indra/llcommon/llkeythrottle.h
+++ b/linden/indra/llcommon/llkeythrottle.h
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llkeyusetracker.h b/linden/indra/llcommon/llkeyusetracker.h
index 1c196bc..1dc29ce 100644
--- a/linden/indra/llcommon/llkeyusetracker.h
+++ b/linden/indra/llcommon/llkeyusetracker.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/lllinkedqueue.h b/linden/indra/llcommon/lllinkedqueue.h
index 7b87909..3f0eb18 100644
--- a/linden/indra/llcommon/lllinkedqueue.h
+++ b/linden/indra/llcommon/lllinkedqueue.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llliveappconfig.cpp b/linden/indra/llcommon/llliveappconfig.cpp
index 21b646b..e1bfc11 100644
--- a/linden/indra/llcommon/llliveappconfig.cpp
+++ b/linden/indra/llcommon/llliveappconfig.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llliveappconfig.h b/linden/indra/llcommon/llliveappconfig.h
index 2a96661..55d84a4 100644
--- a/linden/indra/llcommon/llliveappconfig.h
+++ b/linden/indra/llcommon/llliveappconfig.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/lllivefile.cpp b/linden/indra/llcommon/lllivefile.cpp
index a1e2d8f..810ae70 100644
--- a/linden/indra/llcommon/lllivefile.cpp
+++ b/linden/indra/llcommon/lllivefile.cpp
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/lllivefile.h b/linden/indra/llcommon/lllivefile.h
index 8bf0371..fddf006 100644
--- a/linden/indra/llcommon/lllivefile.h
+++ b/linden/indra/llcommon/lllivefile.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/lllocalidhashmap.h b/linden/indra/llcommon/lllocalidhashmap.h
index c264ac0..a58ae2e 100644
--- a/linden/indra/llcommon/lllocalidhashmap.h
+++ b/linden/indra/llcommon/lllocalidhashmap.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/lllog.cpp b/linden/indra/llcommon/lllog.cpp
index d5fb2a0..db5d25d 100644
--- a/linden/indra/llcommon/lllog.cpp
+++ b/linden/indra/llcommon/lllog.cpp
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -45,8 +46,8 @@ public:
        LLLogImpl(LLApp* app) : mApp(app) {}
        ~LLLogImpl() {}
-        void log(const std::string message, LLSD& info);
+        void log(const std::string &message, LLSD& info);
-        bool useLegacyLogMessage(const std::string message);
+        bool useLegacyLogMessage(const std::string &message);
 private:
        LLApp* mApp;
@@ -54,7 +55,7 @@ private:
 //@brief Function to log a message to syslog for streambase to collect.
-void LLLogImpl::log(const std::string message, LLSD& info)
+void LLLogImpl::log(const std::string &message, LLSD& info)
 {
        static S32 sequence = 0;
    LLSD log_config = mApp->getOption("log-messages");
@@ -74,7 +75,7 @@ void LLLogImpl::log(const std::string message, LLSD& info)
 }
 //@brief Function to check if specified legacy log message should be sent.
-bool LLLogImpl::useLegacyLogMessage(const std::string message)
+bool LLLogImpl::useLegacyLogMessage(const std::string &message)
 {
    LLSD log_config = mApp->getOption("log-messages");
        if (log_config.has(message))
@@ -100,12 +101,12 @@ LLLog::~LLLog()
        mImpl = NULL;
 }
-void LLLog::log(const std::string message, LLSD& info)
+void LLLog::log(const std::string &message, LLSD& info)
 {
        if (mImpl) mImpl->log(message, info);
 }
-bool LLLog::useLegacyLogMessage(const std::string message)
+bool LLLog::useLegacyLogMessage(const std::string &message)
 {
        if (mImpl)
        {
diff --git a/linden/indra/llcommon/lllog.h b/linden/indra/llcommon/lllog.h
index 200f48a..7ac6c8a 100644
--- a/linden/indra/llcommon/lllog.h
+++ b/linden/indra/llcommon/lllog.h
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -46,8 +47,8 @@ public:
        LLLog(LLApp* app);
        virtual ~LLLog();
-        virtual void log(const std::string message, LLSD& info);
+        virtual void log(const std::string &message, LLSD& info);
-        virtual bool useLegacyLogMessage(const std::string message);
+        virtual bool useLegacyLogMessage(const std::string &message);
 private:
        LLLogImpl* mImpl;
diff --git a/linden/indra/llcommon/lllslconstants.h b/linden/indra/llcommon/lllslconstants.h
index 3aa38b8..7cd854f 100644
--- a/linden/indra/llcommon/lllslconstants.h
+++ b/linden/indra/llcommon/lllslconstants.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -187,4 +188,18 @@ const S32 OBJECT_CREATOR = 8;
 // llTextBox() magic token string - yes this is a hack.  sue me.
 const std::string TEXTBOX_MAGIC_TOKEN = "!!llTextBox!!";
+// changed() event flags
+const U32       CHANGED_NONE = 0x0;
+const U32       CHANGED_INVENTORY = 0x1;
+const U32       CHANGED_COLOR = 0x2;
+const U32       CHANGED_SHAPE = 0x4;
+const U32       CHANGED_SCALE = 0x8;
+const U32       CHANGED_TEXTURE = 0x10;
+const U32       CHANGED_LINK = 0x20;
+const U32       CHANGED_ALLOWED_DROP = 0x40;
+const U32       CHANGED_OWNER = 0x80;
+const U32       CHANGED_REGION = 0x100;
+const U32       CHANGED_TELEPORT = 0x200;
+const U32       CHANGED_REGION_START = 0x400;
 #endif
diff --git a/linden/indra/llcommon/llmap.h b/linden/indra/llcommon/llmap.h
index 71a168b..c94d4d4 100644
--- a/linden/indra/llcommon/llmap.h
+++ b/linden/indra/llcommon/llmap.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llmd5.cpp b/linden/indra/llcommon/llmd5.cpp
index c58461f..14b4f9f 100644
--- a/linden/indra/llcommon/llmd5.cpp
+++ b/linden/indra/llcommon/llmd5.cpp
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llmd5.h b/linden/indra/llcommon/llmd5.h
index 2d0205d..d8bca03 100644
--- a/linden/indra/llcommon/llmd5.h
+++ b/linden/indra/llcommon/llmd5.h
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llmemory.cpp b/linden/indra/llcommon/llmemory.cpp
index a03fe9d..a6de3d2 100644
--- a/linden/indra/llcommon/llmemory.cpp
+++ b/linden/indra/llcommon/llmemory.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -38,7 +39,7 @@
 # include <sys/types.h>
 # include <mach/task.h>
 # include <mach/mach_init.h>
-#elif defined(LL_LINUX)
+#elif LL_LINUX || LL_SOLARIS
 # include <unistd.h>
 #endif
@@ -388,6 +389,34 @@ bail:
        return rss;
 }
+#elif LL_SOLARIS
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+U64 getCurrentRSS()
+{
+        char path [LL_MAX_PATH];        /* Flawfinder: ignore */ 
+        sprintf(path, "/proc/%d/psinfo", (int)getpid());
+        int proc_fd = -1;
+        if((proc_fd = open(path, O_RDONLY)) == -1){
+                llwarns << "LLmemory::getCurrentRSS() unable to open " << path << ". Returning 0 RSS!" << llendl;
+                return 0;
+        }
+        psinfo_t proc_psinfo;
+        if(read(proc_fd, &proc_psinfo, sizeof(psinfo_t)) != sizeof(psinfo_t)){
+                llwarns << "LLmemory::getCurrentRSS() Unable to read from " << path << ". Returning 0 RSS!" << llendl;
+                close(proc_fd);
+                return 0;
+        }
+        close(proc_fd);
+        return((U64)proc_psinfo.pr_rssize * 1024);
+}
 #else
 U64 getCurrentRSS()
diff --git a/linden/indra/llcommon/llmemory.h b/linden/indra/llcommon/llmemory.h
index 7b3426f..b5c0711 100644
--- a/linden/indra/llcommon/llmemory.h
+++ b/linden/indra/llcommon/llmemory.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -409,53 +410,58 @@ protected:
 //
 //   class Foo: public LLSingleton<Foo>{};
 //
-//   Foo* instance = Foo::getInstance();
+//   Foo& instance = Foo::instance();
 //
-// The second way is to define a seperate class that exposes the singleton
+// The second way is to use the singleton class directly, without inheritance:
-// interface:
 //
-//   class FooSingleton: public LLSingleton<Foo>{};
+//   typedef LLSingleton<Foo> FooSingleton;
 //
-//   Foo* instance = FooSingleton::getInstance();
+//   Foo& instance = FooSingleton::instance();
+//
+// In this case, the class being managed as a singleton needs to provide an
+// initSingleton() method since the LLSingleton virtual method won't be
+// available
 //
 // 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()
+        virtual ~LLSingleton() {}
+#ifdef  LL_MSVC7
+// 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
+        static T* getInstance()
    {
        LLSingleton<T> singleton;
-        return singleton.get();
+        return singleton.vsHack();
-    }
-private:
-        T* get()
-    {
-        static T instance;
-        return &instance;
    }
-};
+        T* vsHack()
 #else
-template <typename T>
-class LLSingleton
-{
-public:
        static T* getInstance()
+#endif
        {
                static T instance;
+                static bool needs_init = true;
+                if (needs_init)
+                {
+                        needs_init = false;
+                        instance.initSingleton();
+                }
                return &instance;
        }
-};
-#endif
+        static T& instance()
+        {
+                return *getInstance();
+        }
+private:
+        virtual void initSingleton() {}
+};
 //----------------------------------------------------------------------------
diff --git a/linden/indra/llcommon/llmemorystream.cpp b/linden/indra/llcommon/llmemorystream.cpp
index 362c7d1..5c01c95 100644
--- a/linden/indra/llcommon/llmemorystream.cpp
+++ b/linden/indra/llcommon/llmemorystream.cpp
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llmemorystream.h b/linden/indra/llcommon/llmemorystream.h
index 89abb7b..f348632 100644
--- a/linden/indra/llcommon/llmemorystream.h
+++ b/linden/indra/llcommon/llmemorystream.h
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llmemtype.h b/linden/indra/llcommon/llmemtype.h
index 27091ff..a9ebc20 100644
--- a/linden/indra/llcommon/llmemtype.h
+++ b/linden/indra/llcommon/llmemtype.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llmetrics.cpp b/linden/indra/llcommon/llmetrics.cpp
index 73748c8..8db3284 100644
--- a/linden/indra/llcommon/llmetrics.cpp
+++ b/linden/indra/llcommon/llmetrics.cpp
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llmetrics.h b/linden/indra/llcommon/llmetrics.h
index 1b763ba..1d91e8c 100644
--- a/linden/indra/llcommon/llmetrics.h
+++ b/linden/indra/llcommon/llmetrics.h
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llmortician.cpp b/linden/indra/llcommon/llmortician.cpp
index bb93843..c800b65 100644
--- a/linden/indra/llcommon/llmortician.cpp
+++ b/linden/indra/llcommon/llmortician.cpp
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llmortician.h b/linden/indra/llcommon/llmortician.h
index 5a8aae6..fcda3df 100644
--- a/linden/indra/llcommon/llmortician.h
+++ b/linden/indra/llcommon/llmortician.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llnametable.h b/linden/indra/llcommon/llnametable.h
index 35a40af..335a191 100644
--- a/linden/indra/llcommon/llnametable.h
+++ b/linden/indra/llcommon/llnametable.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llpreprocessor.h b/linden/indra/llcommon/llpreprocessor.h
index 9bc2847..2e4fd47 100644
--- a/linden/indra/llcommon/llpreprocessor.h
+++ b/linden/indra/llcommon/llpreprocessor.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -39,7 +40,16 @@
 #include <endian.h>
 #endif  //      LL_LINUX
-#if (defined(LL_WINDOWS) || (defined(LL_LINUX) && (__BYTE_ORDER == __LITTLE_ENDIAN)) || (defined(LL_DARWIN) && defined(__LITTLE_ENDIAN__)))
+#if LL_SOLARIS
+#   ifdef  __sparc     // Since we're talking Solaris 10 and up, only 64 bit is supported.
+#      define LL_BIG_ENDIAN 1
+#      define LL_SOLARIS_ALIGNED_CPU 1     //  used to designate issues where SPARC alignment is addressed
+#      define LL_SOLARIS_NON_MESA_GL 1      //  The SPARC GL does not provide a MESA-based GL API
+#   endif
+#   include <sys/isa_defs.h> // ensure we know which end is up
+#endif // LL_SOLARIS
+#if (defined(LL_WINDOWS) || (defined(LL_LINUX) && (__BYTE_ORDER == __LITTLE_ENDIAN)) || (defined(LL_DARWIN) && defined(__LITTLE_ENDIAN__)) || (defined(LL_SOLARIS) && defined(__i386)))
 #define LL_LITTLE_ENDIAN 1
 #else
 #define LL_BIG_ENDIAN 1
diff --git a/linden/indra/llcommon/llpriqueuemap.h b/linden/indra/llcommon/llpriqueuemap.h
index 13b2887..a861ac1 100644
--- a/linden/indra/llcommon/llpriqueuemap.h
+++ b/linden/indra/llcommon/llpriqueuemap.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llprocessor.cpp b/linden/indra/llcommon/llprocessor.cpp
index 1857fdc..469e544 100644
--- a/linden/indra/llcommon/llprocessor.cpp
+++ b/linden/indra/llcommon/llprocessor.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -278,7 +279,7 @@ bool CProcessor::AnalyzeIntelProcessor()
        // Only override the brand if we have it in the lookup table.  We should
        // already have a string here from GetCPUInfo().  JC
-        if (CPUInfo.uiBrandID < (sizeof(INTEL_BRAND)/sizeof(INTEL_BRAND[0])))
+        if ( CPUInfo.uiBrandID < LL_ARRAY_SIZE(INTEL_BRAND) )
        {
                strcpy(CPUInfo.strBrandID, INTEL_BRAND[CPUInfo.uiBrandID]);
@@ -1664,6 +1665,10 @@ const ProcessorInfo *CProcessor::GetCPUInfo()
 #elif LL_SOLARIS
 #include <kstat.h>
+#if defined(__i386)
+#include <sys/auxv.h>
+#endif
 // ======================
 // Class constructor:
 /////////////////////////
@@ -1777,6 +1782,37 @@ const ProcessorInfo *CProcessor::GetCPUInfo()
        // DEBUG llinfo << "The system has " << ncpus << " CPUs with a clock rate of " <<  uqwFrequency << "MHz." << llendl;
        
+#if defined (__i386)  //  we really don't care about the CPU extensions on SPARC but on x86...
+        // Now get cpu extensions
+        uint_t ui;
+        (void) getisax(&ui, 1);
+        
+        if(ui & AV_386_FPU)
+                CPUInfo._Ext.FPU_FloatingPointUnit = true;
+        if(ui & AV_386_CX8)
+                CPUInfo._Ext.CX8_COMPXCHG8B_Instruction = true;
+        if(ui & AV_386_MMX)
+                CPUInfo._Ext.MMX_MultimediaExtensions = true;
+        if(ui & AV_386_AMD_MMX)
+                CPUInfo._Ext.MMX_MultimediaExtensions = true;
+        if(ui & AV_386_FXSR)
+                CPUInfo._Ext.FXSR_FastStreamingSIMD_ExtensionsSaveRestore = true;
+        if(ui & AV_386_SSE)
+                 CPUInfo._Ext.SSE_StreamingSIMD_Extensions = true;
+        if(ui & AV_386_SSE2)
+                CPUInfo._Ext.SSE2_StreamingSIMD2_Extensions = true;
+/* Left these here since they may get used later
+        if(ui & AV_386_SSE3)
+                CPUInfo._Ext.... = true;
+        if(ui & AV_386_AMD_3DNow)
+                CPUInfo._Ext.... = true;
+        if(ui & AV_386_AMD_3DNowx)
+                CPUInfo._Ext.... = true;
+*/
+#endif
        return (&CPUInfo);
 }
diff --git a/linden/indra/llcommon/llprocessor.h b/linden/indra/llcommon/llprocessor.h
index f5ffd5e..746d007 100644
--- a/linden/indra/llcommon/llprocessor.h
+++ b/linden/indra/llcommon/llprocessor.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llptrskiplist.h b/linden/indra/llcommon/llptrskiplist.h
index 453171d..6878165 100644
--- a/linden/indra/llcommon/llptrskiplist.h
+++ b/linden/indra/llcommon/llptrskiplist.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llptrskipmap.h b/linden/indra/llcommon/llptrskipmap.h
index b568fef..20d0019 100644
--- a/linden/indra/llcommon/llptrskipmap.h
+++ b/linden/indra/llcommon/llptrskipmap.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llqueuedthread.cpp b/linden/indra/llcommon/llqueuedthread.cpp
index dfe3d6f..cd53e70 100644
--- a/linden/indra/llcommon/llqueuedthread.cpp
+++ b/linden/indra/llcommon/llqueuedthread.cpp
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -196,8 +197,9 @@ LLQueuedThread::handle_t LLQueuedThread::generateHandle()
        {
                mNextHandle++;
        }
+        const LLQueuedThread::handle_t res = mNextHandle++;
        unlockData();
-        return mNextHandle++;
+        return res;
 }
 // MAIN thread
diff --git a/linden/indra/llcommon/llqueuedthread.h b/linden/indra/llcommon/llqueuedthread.h
index 180ff42..3ba43e1 100644
--- a/linden/indra/llcommon/llqueuedthread.h
+++ b/linden/indra/llcommon/llqueuedthread.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llrand.cpp b/linden/indra/llcommon/llrand.cpp
index 80335bb..0b2f8b8 100644
--- a/linden/indra/llcommon/llrand.cpp
+++ b/linden/indra/llcommon/llrand.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llrand.h b/linden/indra/llcommon/llrand.h
index 3634918..d12597b 100644
--- a/linden/indra/llcommon/llrand.h
+++ b/linden/indra/llcommon/llrand.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llrun.cpp b/linden/indra/llcommon/llrun.cpp
index 12e3f69..e2f69ff 100644
--- a/linden/indra/llcommon/llrun.cpp
+++ b/linden/indra/llcommon/llrun.cpp
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llrun.h b/linden/indra/llcommon/llrun.h
index 736a355..77b23d9 100644
--- a/linden/indra/llcommon/llrun.h
+++ b/linden/indra/llcommon/llrun.h
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llsd.cpp b/linden/indra/llcommon/llsd.cpp
index 19471a0..2cc94c2 100644
--- a/linden/indra/llcommon/llsd.cpp
+++ b/linden/indra/llcommon/llsd.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -349,7 +350,7 @@ namespace
                virtual bool has(const LLSD::String&) const; 
                virtual LLSD get(const LLSD::String&) const; 
-                        void insert(const LLSD::String& k, const LLSD& v);
+                        LLSD& insert(const LLSD::String& k, const LLSD& v);
                virtual void erase(const LLSD::String&);
                              LLSD& ref(const LLSD::String&);
                virtual const LLSD& ref(const LLSD::String&) const;
@@ -388,9 +389,14 @@ namespace
                return (i != mData.end()) ? i->second : LLSD();
        }
        
-        void ImplMap::insert(const LLSD::String& k, const LLSD& v)
+        LLSD& ImplMap::insert(const LLSD::String& k, const LLSD& v)
        {
                mData.insert(DataMap::value_type(k, v));
+                #ifdef LL_MSVC7
+                        return *((LLSD*)this);
+                #else
+                        return *dynamic_cast<LLSD*>(this);
+                #endif
        }
        
        void ImplMap::erase(const LLSD::String& k)
@@ -436,7 +442,7 @@ namespace
                virtual int size() const; 
                virtual LLSD get(LLSD::Integer) const;
                        void set(LLSD::Integer, const LLSD&);
-                        void insert(LLSD::Integer, const LLSD&);
+                        LLSD& insert(LLSD::Integer, const LLSD&);
                        void append(const LLSD&);
                virtual void erase(LLSD::Integer);
                              LLSD& ref(LLSD::Integer);
@@ -485,9 +491,15 @@ namespace
                mData[index] = v;
        }
        
-        void ImplArray::insert(LLSD::Integer i, const LLSD& v)
+        LLSD& ImplArray::insert(LLSD::Integer i, const LLSD& v)
        {
-                if (i < 0) { return; }
+                if (i < 0) {
+                        #ifdef LL_MSVC7
+                                return *((LLSD*)this);
+                        #else
+                                return *dynamic_cast<LLSD*>(this);
+                        #endif
+                }
                DataVector::size_type index = i;
                
                if (index >= mData.size())
@@ -496,6 +508,11 @@ namespace
                }
                
                mData.insert(mData.begin() + index, v);
+                #ifdef LL_MSVC7
+                        return *((LLSD*)this);
+                #else
+                        return *dynamic_cast<LLSD*>(this);
+                #endif
        }
        
        void ImplArray::append(const LLSD& v)
@@ -739,8 +756,11 @@ LLSD LLSD::emptyMap()
 bool LLSD::has(const String& k) const   { return safe(impl).has(k); }
 LLSD LLSD::get(const String& k) const   { return safe(impl).get(k); } 
-void LLSD::insert(const String& k, const LLSD& v)
+LLSD& LLSD::insert(const String& k, const LLSD& v)
-                                                                                { makeMap(impl).insert(k, v); }
+                                                                                { 
+                                                                                        makeMap(impl).insert(k, v); 
+                                                                                        return *dynamic_cast<LLSD*>(this);
+                                                                                }
 void LLSD::erase(const String& k)               { makeMap(impl).erase(k); }
 LLSD&           LLSD::operator[](const String& k)
@@ -761,8 +781,11 @@ int LLSD::size() const					{ return safe(impl).size(); }
 LLSD LLSD::get(Integer i) const                 { return safe(impl).get(i); } 
 void LLSD::set(Integer i, const LLSD& v){ makeArray(impl).set(i, v); }
-void LLSD::insert(Integer i, const LLSD& v)
+LLSD& LLSD::insert(Integer i, const LLSD& v)
-                                                                                { makeArray(impl).insert(i, v); }
+                                                                                { 
+                                                                                        makeArray(impl).insert(i, v); 
+                                                                                        return *this;
+                                                                                }
 void LLSD::append(const LLSD& v)                { makeArray(impl).append(v); }
 void LLSD::erase(Integer i)                             { makeArray(impl).erase(i); }
diff --git a/linden/indra/llcommon/llsd.h b/linden/indra/llcommon/llsd.h
index 31b519f..d2845a3 100644
--- a/linden/indra/llcommon/llsd.h
+++ b/linden/indra/llcommon/llsd.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -222,7 +223,7 @@ public:
                
                bool has(const String&) const;
                LLSD get(const String&) const;
-                void insert(const String&, const LLSD&);
+                LLSD& insert(const String&, const LLSD&);
                void erase(const String&);
                
                LLSD& operator[](const String&);
@@ -237,7 +238,7 @@ public:
                
                LLSD get(Integer) const;
                void set(Integer, const LLSD&);
-                void insert(Integer, const LLSD&);
+                LLSD& insert(Integer, const LLSD&);
                void append(const LLSD&);
                void erase(Integer);
                
diff --git a/linden/indra/llcommon/llsdserialize.cpp b/linden/indra/llcommon/llsdserialize.cpp
index 0ee1d73..9f4ce64 100644
--- a/linden/indra/llcommon/llsdserialize.cpp
+++ b/linden/indra/llcommon/llsdserialize.cpp
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llsdserialize.h b/linden/indra/llcommon/llsdserialize.h
index f56e45c..f7cd91b 100644
--- a/linden/indra/llcommon/llsdserialize.h
+++ b/linden/indra/llcommon/llsdserialize.h
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llsdserialize_xml.cpp b/linden/indra/llcommon/llsdserialize_xml.cpp
index 6734ed4..c12ca35 100644
--- a/linden/indra/llcommon/llsdserialize_xml.cpp
+++ b/linden/indra/llcommon/llsdserialize_xml.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -318,8 +319,8 @@ private:
        bool mSkipping;
        int mSkipThrough;
        
-        std::string mCurrentKey;
+        std::string mCurrentKey;                // Current XML <tag>
-        std::ostringstream mCurrentContent;
+        std::string mCurrentContent;    // String data between <tag> and </tag>
 };
@@ -556,16 +557,50 @@ void LLSDXMLParser::Impl::parsePart(const char* buf, int len)
        }
 }
+// Performance testing code
+//#define       XML_PARSER_PERFORMANCE_TESTS
+#ifdef XML_PARSER_PERFORMANCE_TESTS
+extern U64 totalTime();
+U64     readElementTime = 0;
+U64 startElementTime = 0;
+U64 endElementTime = 0;
+U64 charDataTime = 0;
+U64 parseTime = 0;
+class XML_Timer
+{
+public:
+        XML_Timer( U64 * sum ) : mSum( sum )
+        {
+                mStart = totalTime();
+        }
+        ~XML_Timer()
+        {
+                *mSum += (totalTime() - mStart);
+        }
+        U64 * mSum;
+        U64 mStart;
+};
+#endif // XML_PARSER_PERFORMANCE_TESTS
 void LLSDXMLParser::Impl::startElementHandler(const XML_Char* name, const XML_Char** attributes)
 {
+        #ifdef XML_PARSER_PERFORMANCE_TESTS
+        XML_Timer timer( &startElementTime );
+        #endif // XML_PARSER_PERFORMANCE_TESTS
+        
        ++mDepth;
        if (mSkipping)
        {
                return;
        }
-        
        Element element = readElement(name);
-        mCurrentContent.str("");
+        
+        mCurrentContent.clear();
        switch (element)
        {
@@ -645,6 +680,10 @@ void LLSDXMLParser::Impl::startElementHandler(const XML_Char* name, const XML_Ch
 void LLSDXMLParser::Impl::endElementHandler(const XML_Char* name)
 {
+        #ifdef XML_PARSER_PERFORMANCE_TESTS
+        XML_Timer timer( &endElementTime );
+        #endif // XML_PARSER_PERFORMANCE_TESTS
        --mDepth;
        if (mSkipping)
        {
@@ -669,7 +708,7 @@ void LLSDXMLParser::Impl::endElementHandler(const XML_Char* name)
                        return;
        
                case ELEMENT_KEY:
-                        mCurrentKey = mCurrentContent.str();
+                        mCurrentKey = mCurrentContent;
                        return;
                        
                default:
@@ -682,9 +721,6 @@ void LLSDXMLParser::Impl::endElementHandler(const XML_Char* name)
        LLSD& value = *mStack.back();
        mStack.pop_back();
        
-        std::string content = mCurrentContent.str();
-        mCurrentContent.str("");
        switch (element)
        {
                case ELEMENT_UNDEF:
@@ -692,39 +728,59 @@ void LLSDXMLParser::Impl::endElementHandler(const XML_Char* name)
                        break;
                
                case ELEMENT_BOOL:
-                        value = content == "true" || content == "1";
+                        value = (mCurrentContent == "true" || mCurrentContent == "1");
                        break;
                
                case ELEMENT_INTEGER:
-                        value = LLSD(content).asInteger();
+                        {
+                                S32 i;
+                                if ( sscanf(mCurrentContent.c_str(), "%d", &i ) == 1 )
+                                {       // See if sscanf works - it's faster
+                                        value = i;
+                                }
+                                else
+                                {
+                                        value = LLSD(mCurrentContent).asInteger();
+                                }
+                        }
                        break;
                
                case ELEMENT_REAL:
-                        value = LLSD(content).asReal();
+                        {
+                                F64 r;
+                                if ( sscanf(mCurrentContent.c_str(), "%lf", &r ) == 1 )
+                                {       // See if sscanf works - it's faster
+                                        value = r;
+                                }
+                                else
+                                {
+                                        value = LLSD(mCurrentContent).asReal();
+                                }
+                        }
                        break;
                
                case ELEMENT_STRING:
-                        value = content;
+                        value = mCurrentContent;
                        break;
                
                case ELEMENT_UUID:
-                        value = LLSD(content).asUUID();
+                        value = LLSD(mCurrentContent).asUUID();
                        break;
                
                case ELEMENT_DATE:
-                        value = LLSD(content).asDate();
+                        value = LLSD(mCurrentContent).asDate();
                        break;
                
                case ELEMENT_URI:
-                        value = LLSD(content).asURI();
+                        value = LLSD(mCurrentContent).asURI();
                        break;
                
                case ELEMENT_BINARY:
                {
-                        S32 len = apr_base64_decode_len(content.c_str());
+                        S32 len = apr_base64_decode_len(mCurrentContent.c_str());
                        std::vector<U8> data;
                        data.resize(len);
-                        len = apr_base64_decode_binary(&data[0], content.c_str());
+                        len = apr_base64_decode_binary(&data[0], mCurrentContent.c_str());
                        data.resize(len);
                        value = data;
                        break;
@@ -738,11 +794,17 @@ void LLSDXMLParser::Impl::endElementHandler(const XML_Char* name)
                        // other values, map and array, have already been set
                        break;
        }
+        mCurrentContent.clear();
 }
 void LLSDXMLParser::Impl::characterDataHandler(const XML_Char* data, int length)
 {
-        mCurrentContent.write(data, length);
+        #ifdef XML_PARSER_PERFORMANCE_TESTS
+        XML_Timer timer( &charDataTime );
+        #endif  // XML_PARSER_PERFORMANCE_TESTS
+        mCurrentContent.append(data, length);
 }
@@ -765,22 +827,69 @@ void LLSDXMLParser::Impl::sCharacterDataHandler(
 }
+/*
+        This code is time critical
+        This is a sample of tag occurances of text in simstate file with ~8000 objects.
+        A tag pair (<key>something</key>) counts is counted as two:
+                key     - 2680178
+                real    - 1818362
+                integer -  906078
+                array   -  295682
+                map     -  191818
+                uuid    -  177903
+                binary  -  175748
+                string  -   53482
+                undef   -   40353
+                boolean -   33874
+                llsd    -   16332
+                uri     -      38
+                date    -       1
+*/
 LLSDXMLParser::Impl::Element LLSDXMLParser::Impl::readElement(const XML_Char* name)
 {
-        if (strcmp(name, "llsd") == 0) { return ELEMENT_LLSD; }
+        #ifdef XML_PARSER_PERFORMANCE_TESTS
-        if (strcmp(name, "undef") == 0) { return ELEMENT_UNDEF; }
+        XML_Timer timer( &readElementTime );
-        if (strcmp(name, "boolean") == 0) { return ELEMENT_BOOL; }
+        #endif // XML_PARSER_PERFORMANCE_TESTS
-        if (strcmp(name, "integer") == 0) { return ELEMENT_INTEGER; }
-        if (strcmp(name, "real") == 0) { return ELEMENT_REAL; }
+        XML_Char c = *name;
-        if (strcmp(name, "string") == 0) { return ELEMENT_STRING; }
+        switch (c)
-        if (strcmp(name, "uuid") == 0) { return ELEMENT_UUID; }
+        {
-        if (strcmp(name, "date") == 0) { return ELEMENT_DATE; }
+                case 'k':
-        if (strcmp(name, "uri") == 0) { return ELEMENT_URI; }
+                        if (strcmp(name, "key") == 0) { return ELEMENT_KEY; }
-        if (strcmp(name, "binary") == 0) { return ELEMENT_BINARY; }
+                        break;
-        if (strcmp(name, "map") == 0) { return ELEMENT_MAP; }
+                case 'r':
-        if (strcmp(name, "array") == 0) { return ELEMENT_ARRAY; }
+                        if (strcmp(name, "real") == 0) { return ELEMENT_REAL; }
-        if (strcmp(name, "key") == 0) { return ELEMENT_KEY; }
+                        break;
-        
+                case 'i':
+                        if (strcmp(name, "integer") == 0) { return ELEMENT_INTEGER; }
+                        break;
+                case 'a':
+                        if (strcmp(name, "array") == 0) { return ELEMENT_ARRAY; }
+                        break;
+                case 'm':
+                        if (strcmp(name, "map") == 0) { return ELEMENT_MAP; }
+                        break;
+                case 'u':
+                        if (strcmp(name, "uuid") == 0) { return ELEMENT_UUID; }
+                        if (strcmp(name, "undef") == 0) { return ELEMENT_UNDEF; }
+                        if (strcmp(name, "uri") == 0) { return ELEMENT_URI; }
+                        break;
+                case 'b':
+                        if (strcmp(name, "binary") == 0) { return ELEMENT_BINARY; }
+                        if (strcmp(name, "boolean") == 0) { return ELEMENT_BOOL; }
+                        break;
+                case 's':
+                        if (strcmp(name, "string") == 0) { return ELEMENT_STRING; }
+                        break;
+                case 'l':
+                        if (strcmp(name, "llsd") == 0) { return ELEMENT_LLSD; }
+                        break;
+                case 'd':
+                        if (strcmp(name, "date") == 0) { return ELEMENT_DATE; }
+                        break;
+        }
        return ELEMENT_UNKNOWN;
 }
@@ -808,6 +917,10 @@ void LLSDXMLParser::parsePart(const char *buf, int len)
 // virtual
 S32 LLSDXMLParser::doParse(std::istream& input, LLSD& data) const
 {
+        #ifdef XML_PARSER_PERFORMANCE_TESTS
+        XML_Timer timer( &parseTime );
+        #endif  // XML_PARSER_PERFORMANCE_TESTS
        if (mParseLines)
        {
                // Use line-based reading (faster code)
diff --git a/linden/indra/llcommon/llsdserialize_xml.h b/linden/indra/llcommon/llsdserialize_xml.h
index 1cbc345..53aa09f 100644
--- a/linden/indra/llcommon/llsdserialize_xml.h
+++ b/linden/indra/llcommon/llsdserialize_xml.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llsdutil.cpp b/linden/indra/llcommon/llsdutil.cpp
index 37b7f24..aa0e0f3 100644
--- a/linden/indra/llcommon/llsdutil.cpp
+++ b/linden/indra/llcommon/llsdutil.cpp
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llsdutil.h b/linden/indra/llcommon/llsdutil.h
index db5ede3..b67ad52 100644
--- a/linden/indra/llcommon/llsdutil.h
+++ b/linden/indra/llcommon/llsdutil.h
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llsecondlifeurls.cpp b/linden/indra/llcommon/llsecondlifeurls.cpp
index 579313c..d7de8d8 100644
--- a/linden/indra/llcommon/llsecondlifeurls.cpp
+++ b/linden/indra/llcommon/llsecondlifeurls.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llsecondlifeurls.h b/linden/indra/llcommon/llsecondlifeurls.h
index 73ada00..9fd75c3 100644
--- a/linden/indra/llcommon/llsecondlifeurls.h
+++ b/linden/indra/llcommon/llsecondlifeurls.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llsimplehash.h b/linden/indra/llcommon/llsimplehash.h
index 24edf82..0ba2a30 100644
--- a/linden/indra/llcommon/llsimplehash.h
+++ b/linden/indra/llcommon/llsimplehash.h
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llskiplist.h b/linden/indra/llcommon/llskiplist.h
index 514f3ba..33a8687 100644
--- a/linden/indra/llcommon/llskiplist.h
+++ b/linden/indra/llcommon/llskiplist.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llskipmap.h b/linden/indra/llcommon/llskipmap.h
index d0f557f..6bbca8f 100644
--- a/linden/indra/llcommon/llskipmap.h
+++ b/linden/indra/llcommon/llskipmap.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llsmoothstep.h b/linden/indra/llcommon/llsmoothstep.h
index 86cc884..153c83d 100644
--- a/linden/indra/llcommon/llsmoothstep.h
+++ b/linden/indra/llcommon/llsmoothstep.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llstack.h b/linden/indra/llcommon/llstack.h
index b36cfb7..66175c7 100644
--- a/linden/indra/llcommon/llstack.h
+++ b/linden/indra/llcommon/llstack.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llstat.cpp b/linden/indra/llcommon/llstat.cpp
index 31a72e2..cbf5a2e 100644
--- a/linden/indra/llcommon/llstat.cpp
+++ b/linden/indra/llcommon/llstat.cpp
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llstat.h b/linden/indra/llcommon/llstat.h
index eceb5e3..66521a3 100644
--- a/linden/indra/llcommon/llstat.h
+++ b/linden/indra/llcommon/llstat.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llstatenums.h b/linden/indra/llcommon/llstatenums.h
index febd958..f8bf07f 100644
--- a/linden/indra/llcommon/llstatenums.h
+++ b/linden/indra/llcommon/llstatenums.h
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llstl.h b/linden/indra/llcommon/llstl.h
index 13fd9a7..7886179 100644
--- a/linden/indra/llcommon/llstl.h
+++ b/linden/indra/llcommon/llstl.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llstreamtools.cpp b/linden/indra/llcommon/llstreamtools.cpp
index cd903d8..ee4f463 100644
--- a/linden/indra/llcommon/llstreamtools.cpp
+++ b/linden/indra/llcommon/llstreamtools.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llstreamtools.h b/linden/indra/llcommon/llstreamtools.h
index 70cff4d..a6dc4d5 100644
--- a/linden/indra/llcommon/llstreamtools.h
+++ b/linden/indra/llcommon/llstreamtools.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llstrider.h b/linden/indra/llcommon/llstrider.h
index 645f3c1..369b06b 100644
--- a/linden/indra/llcommon/llstrider.h
+++ b/linden/indra/llcommon/llstrider.h
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llstring.cpp b/linden/indra/llcommon/llstring.cpp
index dfd131b..1f653c1 100644
--- a/linden/indra/llcommon/llstring.cpp
+++ b/linden/indra/llcommon/llstring.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -662,7 +663,8 @@ S32	LLStringOps::collate(const llwchar* a, const llwchar* b)
 namespace LLStringFn
 {
-        void replace_nonprintable(std::basic_string<char>& string, char replacement)
+        // NOTE - this restricts output to ascii
+        void replace_nonprintable_in_ascii(std::basic_string<char>& string, char replacement)
        {
                const char MIN = 0x20;
                std::basic_string<char>::size_type len = string.size();
@@ -675,23 +677,9 @@ namespace LLStringFn
                }
        }
-        void replace_nonprintable(
-                std::basic_string<llwchar>& string,
-                llwchar replacement)
-        {
-                const llwchar MIN = 0x20;
-                const llwchar MAX = 0x7f;
-                std::basic_string<llwchar>::size_type len = string.size();
-                for(std::basic_string<llwchar>::size_type ii = 0; ii < len; ++ii)
-                {
-                        if((string[ii] < MIN) || (string[ii] > MAX))
-                        {
-                                string[ii] = replacement;
-                        }
-                }
-        }
-        void replace_nonprintable_and_pipe(std::basic_string<char>& str,
+        // NOTE - this restricts output to ascii
+        void replace_nonprintable_and_pipe_in_ascii(std::basic_string<char>& str,
                                                                           char replacement)
        {
                const char MIN  = 0x20;
@@ -706,22 +694,6 @@ namespace LLStringFn
                }
        }
-        void replace_nonprintable_and_pipe(std::basic_string<llwchar>& str,
-                                                                           llwchar replacement)
-        {
-                const llwchar MIN  = 0x20;
-                const llwchar MAX  = 0x7f;
-                const llwchar PIPE = 0x7c;
-                std::basic_string<llwchar>::size_type len = str.size();
-                for(std::basic_string<llwchar>::size_type ii = 0; ii < len; ++ii)
-                {
-                        if( (str[ii] < MIN) || (str[ii] > MAX) || (str[ii] == PIPE) )
-                        {
-                                str[ii] = replacement;
-                        }
-                }
-        }
        // https://wiki.lindenlab.com/wiki/Unicode_Guidelines has details on
        // allowable code points for XML. Specifically, they are:
        // 0x09, 0x0a, 0x0d, and 0x20 on up.  JC
@@ -747,6 +719,23 @@ namespace LLStringFn
                return output;
        }
+        /**
+         * @brief Replace all control characters (c < 0x20) with replacement in
+         * string.
+         */
+        void replace_ascii_controlchars(std::basic_string<char>& string, char replacement)
+        {
+                const unsigned char MIN = 0x20;
+                std::basic_string<char>::size_type len = string.size();
+                for(std::basic_string<char>::size_type ii = 0; ii < len; ++ii)
+                {
+                        const unsigned char c = (unsigned char) string[ii];
+                        if(c < MIN)
+                        {
+                                string[ii] = replacement;
+                        }
+                }
+        }
 }
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index 720b163..99a9b9e 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -32,15 +33,27 @@
 #ifndef LL_LLSTRING_H
 #define LL_LLSTRING_H
+#include <string>
 #if LL_LINUX || LL_SOLARIS
 #include <wctype.h>
 #include <wchar.h>
 #endif
+#include <string.h>
+#if LL_SOLARIS
+// stricmp and strnicmp do not exist on Solaris:
+#define stricmp strcasecmp
+#define strnicmp strncasecmp
+#endif
 const char LL_UNKNOWN_CHAR = '?';
 #if LL_DARWIN || LL_LINUX || LL_SOLARIS
 // Template specialization of char_traits for U16s. Only necessary on Mac and Linux (exists on Windows already)
+#include <cstring>
 namespace std
 {
 template<>
@@ -486,48 +499,29 @@ namespace LLStringFn
        /**
         * @brief Replace all non-printable characters with replacement in
         * string.
+         * NOTE - this will zap non-ascii
         *
         * @param [in,out] string the to modify. out value is the string
         * with zero non-printable characters.
         * @param The replacement character. use LL_UNKNOWN_CHAR if unsure.
         */
-        void replace_nonprintable(
+        void replace_nonprintable_in_ascii(
                std::basic_string<char>& string,
                char replacement);
-        /**
-         * @brief Replace all non-printable characters with replacement in
-         * a wide string.
-         *
-         * @param [in,out] string the to modify. out value is the string
-         * with zero non-printable characters.
-         * @param The replacement character. use LL_UNKNOWN_CHAR if unsure.
-         */
-        void replace_nonprintable(
-                std::basic_string<llwchar>& string,
-                llwchar replacement);
        /**
         * @brief Replace all non-printable characters and pipe characters
         * with replacement in a string.
+         * NOTE - this will zap non-ascii
         *
         * @param [in,out] the string to modify. out value is the string
         * with zero non-printable characters and zero pipe characters.
         * @param The replacement character. use LL_UNKNOWN_CHAR if unsure.
         */
-        void replace_nonprintable_and_pipe(std::basic_string<char>& str,
+        void replace_nonprintable_and_pipe_in_ascii(std::basic_string<char>& str,
                                                                           char replacement);
-        /**
-         * @brief Replace all non-printable characters and pipe characters
-         * with replacement in a wide string.
-         *
-         * @param [in,out] the string to modify. out value is the string
-         * with zero non-printable characters and zero pipe characters.
-         * @param The replacement wide character. use LL_UNKNOWN_CHAR if unsure.
-         */
-        void replace_nonprintable_and_pipe(std::basic_string<llwchar>& str,
-                                                                           llwchar replacement);
        /**
         * @brief Remove all characters that are not allowed in XML 1.0.
@@ -535,6 +529,19 @@ namespace LLStringFn
         * Works with US ASCII and UTF-8 encoded strings.  JC
         */
        std::string strip_invalid_xml(const std::string& input);
+        /**
+         * @brief Replace all control characters (0 <= c < 0x20) with replacement in
+         * string.   This is safe for utf-8
+         *
+         * @param [in,out] string the to modify. out value is the string
+         * with zero non-printable characters.
+         * @param The replacement character. use LL_UNKNOWN_CHAR if unsure.
+         */
+        void replace_ascii_controlchars(
+                std::basic_string<char>& string,
+                char replacement);
 }
 ////////////////////////////////////////////////////////////
diff --git a/linden/indra/llcommon/llstringtable.cpp b/linden/indra/llcommon/llstringtable.cpp
index c5f575f..27f9036 100644
--- a/linden/indra/llcommon/llstringtable.cpp
+++ b/linden/indra/llcommon/llstringtable.cpp
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llstringtable.h b/linden/indra/llcommon/llstringtable.h
index e7a2edd..4492063 100644
--- a/linden/indra/llcommon/llstringtable.h
+++ b/linden/indra/llcommon/llstringtable.h
@@ -18,7 +18,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llsys.cpp b/linden/indra/llcommon/llsys.cpp
index 06982f0..2e93b2a 100644
--- a/linden/indra/llcommon/llsys.cpp
+++ b/linden/indra/llcommon/llsys.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -58,6 +59,17 @@
 #       include <sys/sysinfo.h>
 const char MEMINFO_FILE[] = "/proc/meminfo";
 const char CPUINFO_FILE[] = "/proc/cpuinfo";
+#elif LL_SOLARIS
+#       include <stdio.h>
+#       include <unistd.h>
+#       include <sys/utsname.h>
+#       define _STRUCTURED_PROC 1
+#       include <sys/procfs.h>
+#       include <sys/types.h>
+#       include <sys/stat.h>
+#       include <fcntl.h>
+#       include <errno.h>
+extern int errno;
 #endif
@@ -288,19 +300,22 @@ U32 LLOSInfo::getProcessVirtualSizeKB()
 #endif
 #if LL_LINUX
        LLFILE* status_filep = LLFile::fopen("/proc/self/status", "rb");
-        S32 numRead = 0;                
+        if (status_filep)
-        char buff[STATUS_SIZE];         /* Flawfinder: ignore */
+        {
+                S32 numRead = 0;                
+                char buff[STATUS_SIZE];         /* Flawfinder: ignore */
-        size_t nbytes = fread(buff, 1, STATUS_SIZE-1, status_filep);
+                size_t nbytes = fread(buff, 1, STATUS_SIZE-1, status_filep);
-        buff[nbytes] = '\0';
+                buff[nbytes] = '\0';
-        // All these guys return numbers in KB
+                // All these guys return numbers in KB
-        char *memp = strstr(buff, "VmSize:");
+                char *memp = strstr(buff, "VmSize:");
-        if (memp)
+                if (memp)
-        {
+                {
-                numRead += sscanf(memp, "%*s %u", &virtual_size);
+                        numRead += sscanf(memp, "%*s %u", &virtual_size);
+                }
+                fclose(status_filep);
        }
-        fclose(status_filep);
 #elif LL_SOLARIS
        char proc_ps[LL_MAX_PATH];
        sprintf(proc_ps, "/proc/%d/psinfo", (int)getpid());
diff --git a/linden/indra/llcommon/llsys.h b/linden/indra/llcommon/llsys.h
index b2e9624..03f48ca 100644
--- a/linden/indra/llcommon/llsys.h
+++ b/linden/indra/llcommon/llsys.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llthread.cpp b/linden/indra/llcommon/llthread.cpp
index af055a9..37b03a4 100644
--- a/linden/indra/llcommon/llthread.cpp
+++ b/linden/indra/llcommon/llthread.cpp
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -101,12 +102,20 @@ LLThread::LLThread(const std::string& name, apr_pool_t *poolp) :
                apr_pool_create(&mAPRPoolp, NULL); // Create a subpool for this thread
        }
        mRunCondition = new LLCondition(mAPRPoolp);
+        mLocalAPRFilePoolp = NULL ;
 }
 LLThread::~LLThread()
 {
        shutdown();
+        if(mLocalAPRFilePoolp)
+        {
+                delete mLocalAPRFilePoolp ;
+                mLocalAPRFilePoolp = NULL ;
+        }
 }
 void LLThread::shutdown()
diff --git a/linden/indra/llcommon/llthread.h b/linden/indra/llcommon/llthread.h
index 036c330..457f45b 100644
--- a/linden/indra/llcommon/llthread.h
+++ b/linden/indra/llcommon/llthread.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -82,7 +83,8 @@ public:
        void start(void);
        apr_pool_t *getAPRPool() { return mAPRPoolp; }
-        
+        LLVolatileAPRPool* getLocalAPRFilePool() { return mLocalAPRFilePoolp ; }
 private:
        bool                            mPaused;
        
@@ -98,6 +100,11 @@ protected:
        bool                            mIsLocalPool;
        EThreadStatus           mStatus;
+        //a local apr_pool for APRFile operations in this thread. If it exists, LLAPRFile::sAPRFilePoolp should not be used.
+        //Note: this pool is used by APRFile ONLY, do NOT use it for any other purposes.
+        //      otherwise it will cause severe memory leaking!!! --bao
+        LLVolatileAPRPool  *mLocalAPRFilePoolp ; 
        void setQuitting();
        
        // virtual function overridden by subclass -- this will be called when the thread runs
diff --git a/linden/indra/llcommon/lltimer.cpp b/linden/indra/llcommon/lltimer.cpp
index f5b5ef0..fa6efaf 100644
--- a/linden/indra/llcommon/lltimer.cpp
+++ b/linden/indra/llcommon/lltimer.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -569,6 +570,14 @@ LLEventTimer::LLEventTimer(F32 period)
        sActiveList.push_back(this);
 }
+LLEventTimer::LLEventTimer(const LLDate& time)
+: mEventTimer()
+{
+        mPeriod = (F32)(time.secondsSinceEpoch() - LLDate::now().secondsSinceEpoch());
+        sActiveList.push_back(this);
+}
 LLEventTimer::~LLEventTimer() 
 {
        sActiveList.remove(this);
diff --git a/linden/indra/llcommon/lltimer.h b/linden/indra/llcommon/lltimer.h
index a8ec0cc..e2cf1c7 100644
--- a/linden/indra/llcommon/lltimer.h
+++ b/linden/indra/llcommon/lltimer.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -32,12 +33,13 @@
 #ifndef LL_TIMER_H                                      
 #define LL_TIMER_H
-#if LL_LINUX || LL_DARWIN
+#if LL_LINUX || LL_DARWIN || LL_SOLARIS
 #include <sys/time.h>
 #endif
 #include <limits.h>
 #include "stdtypes.h"
+#include "lldate.h"
 #include <string>
 #include <list>
@@ -173,6 +175,7 @@ class LLEventTimer
 {
 public:
        LLEventTimer(F32 period);       // period is the amount of time between each call to tick() in seconds
+        LLEventTimer(const LLDate& time);
        virtual ~LLEventTimer();
        //function to be called at the supplied frequency
diff --git a/linden/indra/llcommon/lluri.cpp b/linden/indra/llcommon/lluri.cpp
index 1c78b2d..3dbc837 100644
--- a/linden/indra/llcommon/lluri.cpp
+++ b/linden/indra/llcommon/lluri.cpp
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -599,3 +600,8 @@ std::string LLURI::mapToQueryString(const LLSD& queryMap)
        }
        return query_string;
 }
+bool operator!=(const LLURI& first, const LLURI& second)
+{
+        return (first.asString() != second.asString());
+}
diff --git a/linden/indra/llcommon/lluri.h b/linden/indra/llcommon/lluri.h
index 9271349..156d80b 100644
--- a/linden/indra/llcommon/lluri.h
+++ b/linden/indra/llcommon/lluri.h
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -187,4 +188,7 @@ private:
        std::string mEscapedQuery;
 };
+// this operator required for tut
+bool operator!=(const LLURI& first, const LLURI& second);
 #endif // LL_LLURI_H
diff --git a/linden/indra/llcommon/lluuid.cpp b/linden/indra/llcommon/lluuid.cpp
index 4f0f95e..bcbae06 100644
--- a/linden/indra/llcommon/lluuid.cpp
+++ b/linden/indra/llcommon/lluuid.cpp
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -208,7 +209,7 @@ std::string LLUUID::asString() const
 BOOL LLUUID::set(const char* in_string, BOOL emit)
 {
-        return set(ll_safe_string(in_string));
+        return set(ll_safe_string(in_string),emit);
 }
 BOOL LLUUID::set(const std::string& in_string, BOOL emit)
@@ -230,7 +231,7 @@ BOOL LLUUID::set(const std::string& in_string, BOOL emit)
                {
                        if(emit)
                        {
-                                llinfos << "Warning! Using broken UUID string format" << llendl;
+                                llwarns << "Warning! Using broken UUID string format" << llendl;
                        }
                        broken_format = TRUE;
                }
@@ -239,7 +240,8 @@ BOOL LLUUID::set(const std::string& in_string, BOOL emit)
                        // Bad UUID string.  Spam as INFO, as most cases we don't care.
                        if(emit)
                        {
-                                llinfos << "Bad UUID string: " << in_string << llendl;
+                                //don't spam the logs because a resident can't spell.
+                                llwarns << "Bad UUID string: " << in_string << llendl;
                        }
                        setNull();
                        return FALSE;
@@ -908,6 +910,21 @@ BOOL LLUUID::parseUUID(const std::string& buf, LLUUID* value)
        return FALSE;
 }
+//static
+LLUUID LLUUID::generateNewID(std::string hash_string)
+{
+        LLUUID new_id;
+        if (hash_string.empty())
+        {
+                new_id.generate();
+        }
+        else
+        {
+                new_id.generate(hash_string);
+        }
+        return new_id;
+}
 LLAssetID LLTransactionID::makeAssetID(const LLUUID& session) const
 {
        LLAssetID result;
diff --git a/linden/indra/llcommon/lluuid.h b/linden/indra/llcommon/lluuid.h
index 876941f..4b32138 100644
--- a/linden/indra/llcommon/lluuid.h
+++ b/linden/indra/llcommon/lluuid.h
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -65,6 +66,9 @@ public:
        //
        void    generate();                                     // Generate a new UUID
        void    generate(const std::string& stream); //Generate a new UUID based on hash of input stream
+        static LLUUID generateNewID(std::string stream = "");   //static version of above for use in initializer expressions such as constructor params, etc. 
        BOOL    set(const char *in_string, BOOL emit = TRUE);   // Convert from string, if emit is FALSE, do not emit warnings
        BOOL    set(const std::string& in_string, BOOL emit = TRUE);    // Convert from string, if emit is FALSE, do not emit warnings
        void    setNull();                                      // Faster than setting to LLUUID::null.
@@ -124,7 +128,7 @@ public:
        static S32 getNodeID(unsigned char * node_id);
        static BOOL parseUUID(const std::string& buf, LLUUID* value);
-        
        U8 mData[UUID_BYTES];
 };
diff --git a/linden/indra/llcommon/lluuidhashmap.h b/linden/indra/llcommon/lluuidhashmap.h
index 67921e6..c45e413 100644
--- a/linden/indra/llcommon/lluuidhashmap.h
+++ b/linden/indra/llcommon/lluuidhashmap.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/llversionserver.h b/linden/indra/llcommon/llversionserver.h
index 79f4630..479b06d 100644
--- a/linden/indra/llcommon/llversionserver.h
+++ b/linden/indra/llcommon/llversionserver.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -33,9 +34,9 @@
 #define LL_LLVERSIONSERVER_H
 const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 24;
+const S32 LL_VERSION_MINOR = 27;
-const S32 LL_VERSION_PATCH = 9;
+const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 98650;
+const S32 LL_VERSION_BUILD = 123523;
 const char * const LL_CHANNEL = "Second Life Server";
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 34fb615..826111f 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -33,9 +34,9 @@
 #define LL_LLVERSIONVIEWER_H
 const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 22;
+const S32 LL_VERSION_MINOR = 23;
-const S32 LL_VERSION_PATCH = 11;
+const S32 LL_VERSION_PATCH = 4;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_BUILD = 123523;
 const char * const LL_CHANNEL = "Imprudence";
diff --git a/linden/indra/llcommon/llworkerthread.cpp b/linden/indra/llcommon/llworkerthread.cpp
index 96a957b..5dda600 100644
--- a/linden/indra/llcommon/llworkerthread.cpp
+++ b/linden/indra/llcommon/llworkerthread.cpp
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -36,16 +37,18 @@
 #include "llframecallbackmanager.h"
 #endif
-BOOL LLWorkerClass::sDeleteLock = FALSE ;
 //============================================================================
 // Run on MAIN thread
 LLWorkerThread::LLWorkerThread(const std::string& name, bool threaded) :
-        LLQueuedThread(name, threaded),
+        LLQueuedThread(name, threaded)
-        mWorkerAPRPoolp(NULL)
 {
-        apr_pool_create(&mWorkerAPRPoolp, NULL);
+        mDeleteMutex = new LLMutex(NULL);
-        mDeleteMutex = new LLMutex(getAPRPool());
+        if(!mLocalAPRFilePoolp)
+        {
+                mLocalAPRFilePoolp = new LLVolatileAPRPool() ;
+        }
 }
 LLWorkerThread::~LLWorkerThread()
@@ -95,7 +98,6 @@ S32 LLWorkerThread::update(U32 max_time_ms)
        {
                (*iter)->abortWork(false);
        }
-        LLWorkerClass::sDeleteLock = TRUE ;
        for (std::vector<LLWorkerClass*>::iterator iter = delete_list.begin();
                 iter != delete_list.end(); ++iter)
        {
@@ -109,8 +111,7 @@ S32 LLWorkerThread::update(U32 max_time_ms)
                }
                delete *iter;
        }
-        LLWorkerClass::sDeleteLock = FALSE ;
+        // delete and aborted entries mean there's still work to do
-    // delete and aborted entries mean there's still work to do
        res += delete_list.size() + abort_list.size();
        return res;
 }
@@ -187,7 +188,7 @@ LLWorkerClass::LLWorkerClass(LLWorkerThread* workerthread, const std::string& na
        : mWorkerThread(workerthread),
          mWorkerClassName(name),
          mRequestHandle(LLWorkerThread::nullHandle()),
-          mMutex(workerthread->getWorkerAPRPool()),
+          mMutex(NULL),
          mWorkFlags(0)
 {
        if (!mWorkerThread)
diff --git a/linden/indra/llcommon/llworkerthread.h b/linden/indra/llcommon/llworkerthread.h
index 62b0696..19407f4 100644
--- a/linden/indra/llcommon/llworkerthread.h
+++ b/linden/indra/llcommon/llworkerthread.h
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -37,6 +38,7 @@
 #include <set>
 #include "llqueuedthread.h"
+#include "llapr.h"
 #define USE_FRAME_CALLBACK_MANAGER 0
@@ -81,14 +83,11 @@ private:
        typedef std::list<LLWorkerClass*> delete_list_t;
        delete_list_t mDeleteList;
        LLMutex* mDeleteMutex;
-        apr_pool_t* mWorkerAPRPoolp;
        
 public:
        LLWorkerThread(const std::string& name, bool threaded = true);
        ~LLWorkerThread();
-        apr_pool_t* getWorkerAPRPool() { return mWorkerAPRPoolp; }
-        
        /*virtual*/ S32 update(U32 max_time_ms);
        
        handle_t addWorkRequest(LLWorkerClass* workerclass, S32 param, U32 priority = PRIORITY_NORMAL);
@@ -120,8 +119,6 @@ class LLWorkerClass
        friend class LLWorkerThread::WorkRequest;
 public:
-        static BOOL sDeleteLock ;
-public:
        typedef LLWorkerThread::handle_t handle_t;
        enum FLAGS
        {
diff --git a/linden/indra/llcommon/metaclass.cpp b/linden/indra/llcommon/metaclass.cpp
index 760d568..90679d3 100644
--- a/linden/indra/llcommon/metaclass.cpp
+++ b/linden/indra/llcommon/metaclass.cpp
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/metaclass.h b/linden/indra/llcommon/metaclass.h
index 3ee7b6f..cc10f16 100644
--- a/linden/indra/llcommon/metaclass.h
+++ b/linden/indra/llcommon/metaclass.h
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/metaclasst.h b/linden/indra/llcommon/metaclasst.h
index 6266c62..0d6a450 100644
--- a/linden/indra/llcommon/metaclasst.h
+++ b/linden/indra/llcommon/metaclasst.h
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/metaproperty.cpp b/linden/indra/llcommon/metaproperty.cpp
index a017318..784a52a 100644
--- a/linden/indra/llcommon/metaproperty.cpp
+++ b/linden/indra/llcommon/metaproperty.cpp
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/metaproperty.h b/linden/indra/llcommon/metaproperty.h
index 8d8e1c6..e5ac359 100644
--- a/linden/indra/llcommon/metaproperty.h
+++ b/linden/indra/llcommon/metaproperty.h
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/metapropertyt.h b/linden/indra/llcommon/metapropertyt.h
index ab08116..79a536a 100644
--- a/linden/indra/llcommon/metapropertyt.h
+++ b/linden/indra/llcommon/metapropertyt.h
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/processor.h b/linden/indra/llcommon/processor.h
index d9196e3..5ba5540 100644
--- a/linden/indra/llcommon/processor.h
+++ b/linden/indra/llcommon/processor.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/reflective.cpp b/linden/indra/llcommon/reflective.cpp
index f20565a..88e07d7 100644
--- a/linden/indra/llcommon/reflective.cpp
+++ b/linden/indra/llcommon/reflective.cpp
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/reflective.h b/linden/indra/llcommon/reflective.h
index e61c931..e2c18eb 100644
--- a/linden/indra/llcommon/reflective.h
+++ b/linden/indra/llcommon/reflective.h
@@ -19,7 +19,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/reflectivet.h b/linden/indra/llcommon/reflectivet.h
index 732c48f..b3195cb 100644
--- a/linden/indra/llcommon/reflectivet.h
+++ b/linden/indra/llcommon/reflectivet.h
@@ -16,7 +16,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/roles_constants.h b/linden/indra/llcommon/roles_constants.h
index a0a24c0..854a153 100644
--- a/linden/indra/llcommon/roles_constants.h
+++ b/linden/indra/llcommon/roles_constants.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/stdenums.h b/linden/indra/llcommon/stdenums.h
index 1c28c0e..41da51f 100644
--- a/linden/indra/llcommon/stdenums.h
+++ b/linden/indra/llcommon/stdenums.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/stdtypes.h b/linden/indra/llcommon/stdtypes.h
index e88cde6..af0b4dd 100644
--- a/linden/indra/llcommon/stdtypes.h
+++ b/linden/indra/llcommon/stdtypes.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -32,6 +33,7 @@
 #define LL_STDTYPES_H
 #include <cfloat>
+#include <climits>
 typedef signed char                     S8;
 typedef unsigned char                   U8;
@@ -104,6 +106,8 @@ typedef U32             		TPACKETID;
 typedef U8 LLPCode;
+#define LL_ARRAY_SIZE( _kArray ) ( sizeof( (_kArray) ) / sizeof( _kArray[0] ) )
 #if LL_LINUX && __GNUC__ <= 2
 typedef int intptr_t;
 #endif
diff --git a/linden/indra/llcommon/string_table.h b/linden/indra/llcommon/string_table.h
index 1d46d81..176be21 100644
--- a/linden/indra/llcommon/string_table.h
+++ b/linden/indra/llcommon/string_table.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/timer.h b/linden/indra/llcommon/timer.h
index b8ed29f..21ed06a 100644
--- a/linden/indra/llcommon/timer.h
+++ b/linden/indra/llcommon/timer.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/timing.cpp b/linden/indra/llcommon/timing.cpp
index 5b5cd55..e1c1f6d 100644
--- a/linden/indra/llcommon/timing.cpp
+++ b/linden/indra/llcommon/timing.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/timing.h b/linden/indra/llcommon/timing.h
index ae7ac31..2b9f60a 100644
--- a/linden/indra/llcommon/timing.h
+++ b/linden/indra/llcommon/timing.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/u64.cpp b/linden/indra/llcommon/u64.cpp
index 6163191..01fe973 100644
--- a/linden/indra/llcommon/u64.cpp
+++ b/linden/indra/llcommon/u64.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llcommon/u64.h b/linden/indra/llcommon/u64.h
index 1c38468..09a6b3e 100644
--- a/linden/indra/llcommon/u64.h
+++ b/linden/indra/llcommon/u64.h
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,