166 files changed, 2466 insertions, 1303 deletions
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index e86b0d2..e622664 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.18.2.1";
+CFBundleShortVersionString = "Second Life version 1.18.3.2";
-CFBundleGetInfoString = "Second Life version 1.18.2.1, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleGetInfoString = "Second Life version 1.18.3.2, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index b897a67..f4ac5c6 100644
--- a/linden/indra/newview/Info-SecondLife.plist
+++ b/linden/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
                </dict>
        </array>
        <key>CFBundleVersion</key>
-        <string>1.18.2.1</string>
+        <string>1.18.3.2</string>
        <key>CSResourcesFileMapped</key>
        <true/>
 </dict>
diff --git a/linden/indra/newview/app_settings/keywords.ini b/linden/indra/newview/app_settings/keywords.ini
index c7f8426..4496ee7 100644
--- a/linden/indra/newview/app_settings/keywords.ini
+++ b/linden/indra/newview/app_settings/keywords.ini
@@ -149,6 +149,16 @@ PSYS_SRC_PATTERN_ANGLE
 PSYS_SRC_PATTERN_ANGLE_CONE
 PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY
+OBJECT_UNKOWN_DETAIL    Returned by llGetObjectDetails when passed an invalid object parameter type.
+OBJECT_NAME                             Used with llGetObjectDetails to get an object's name.
+OBJECT_DESC                             Used with llGetObjectDetails to get an object's description.
+OBJECT_POS                              Used with llGetObjectDetails to get an object's position.
+OBJECT_ROT                              Used with llGetObjectDetails to get an object's rotation.
+OBJECT_VELOCITY                 Used with llGetObjectDetails to get an object's velocity.
+OBJECT_OWNER                    Used with llGetObjectDetails to get an object's owner's key.  Will be NULL_KEY if group owned.
+OBJECT_GROUP                    Used with llGetObjectDetails to get an object's group's key.
+OBJECT_CREATOR                  Used with llGetObjectDetails to get an object's creator's key.
 # some vehicle params
 VEHICLE_TYPE_NONE
 VEHICLE_TYPE_SLED
diff --git a/linden/indra/newview/fakevoicesoundsignal.cpp b/linden/indra/newview/fakevoicesoundsignal.cpp
index 2a271ad..0cb5c11 100644
--- a/linden/indra/newview/fakevoicesoundsignal.cpp
+++ b/linden/indra/newview/fakevoicesoundsignal.cpp
@@ -1,8 +1,32 @@
-//----------------------------------------------------------------------
+/** 
-// Fake Voice Sound Signal
+ * @file fakevoicesoundsignal.cpp
-// author: JJ Ventrella
+ * @brief Fake Voice Sound Signal
-// THIS IS A TEMPORARY FILE FOR DEVELOPMENT PURPOSES ONLY
+ * author: JJ Ventrella
-//----------------------------------------------------------------------
+ * THIS IS A TEMPORARY FILE FOR DEVELOPMENT PURPOSES ONLY
+ *
+ * Copyright (c) 2000-2007, 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://secondlife.com/developers/opensource/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://secondlife.com/developers/opensource/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.
+ */
 #include "llviewerprecompiledheaders.h"
 #include "fakevoicesoundsignal.h"
diff --git a/linden/indra/newview/fakevoicesoundsignal.h b/linden/indra/newview/fakevoicesoundsignal.h
index 9e0132c..a10d9fe 100644
--- a/linden/indra/newview/fakevoicesoundsignal.h
+++ b/linden/indra/newview/fakevoicesoundsignal.h
@@ -1,8 +1,32 @@
-//--------------------------------------------------------------------
+/** 
-// Fake Voice Sound Signal
+ * @file fakevoicesoundsignal.h
-// author: JJ Ventrella
+ * @brief Fake Voice Sound Signal
-// THIS IS A TEMPORARY FILE FOR DEVELOPMENT PURPOSES ONLY
+ * author: JJ Ventrella
-//-----------------------------------------------------------------------------
+ * THIS IS A TEMPORARY FILE FOR DEVELOPMENT PURPOSES ONLY
+ *
+ * Copyright (c) 2000-2007, 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://secondlife.com/developers/opensource/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://secondlife.com/developers/opensource/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.
+ */
 #ifndef FAKE_VOICE_SOUND_SIGNAL_H
 #define FAKE_VOICE_SOUND_SIGNAL_H
diff --git a/linden/indra/newview/featuretable.txt b/linden/indra/newview/featuretable.txt
index 28b1ddc..f98b42b 100644
--- a/linden/indra/newview/featuretable.txt
+++ b/linden/indra/newview/featuretable.txt
@@ -34,6 +34,8 @@ RenderParticleCount	1	4096
 RenderRippleWater       1       1
 RenderTerrainDetail     1       2
 VertexShaderEnable      1       1
+UseOcclusion            1       1
+RenderCubeMap           1       1
 //
 // Class 0 Hardware (Unknown or just old)
diff --git a/linden/indra/newview/featuretable_linux.txt b/linden/indra/newview/featuretable_linux.txt
index 6c7acfa..f31fc0d 100644
--- a/linden/indra/newview/featuretable_linux.txt
+++ b/linden/indra/newview/featuretable_linux.txt
@@ -34,6 +34,8 @@ RenderParticleCount	1	4096
 RenderRippleWater       1       1
 RenderTerrainDetail     1       2
 VertexShaderEnable      1       1
+UseOcclusion            1       1
+RenderCubeMap           1       1
 //
 // Class 0 Hardware (Unknown or just old)
@@ -107,6 +109,8 @@ RenderAvatarVP		0	0
 RenderLighting          1       0
 RenderParticleCount     1       1024
 RenderTerrainDetail 1   0
+RenderCubeMap           0       0
+UseOcclusion            0       0
 list low
@@ -145,6 +149,7 @@ RenderVBO			1	0
 RenderAniso                     1       0
 RenderLighting          1       0
 RenderTerrainDetail     1       0
+RenderCubeMap           0       0
 list GeForce2
 RenderVBO                       1       1
@@ -156,6 +161,7 @@ RenderTerrainDetail	1	0
 list GeForce3
 list ATI
+UseOcclusion            0       0
 list Radeon8500
 RenderLighting          1       0
diff --git a/linden/indra/newview/featuretable_mac.txt b/linden/indra/newview/featuretable_mac.txt
index 2685e3b..fe5ae7a 100644
--- a/linden/indra/newview/featuretable_mac.txt
+++ b/linden/indra/newview/featuretable_mac.txt
@@ -35,7 +35,8 @@ RenderParticleCount	1	4096
 RenderRippleWater       1       1
 RenderTerrainDetail     1       2
 VertexShaderEnable      1       1
+UseOcclusion            1       1
+RenderCubeMap           1       1
 //
 // Class 0 Hardware (Unknown or just old)
diff --git a/linden/indra/newview/files.lst b/linden/indra/newview/files.lst
index a5c348c..52372b3 100644
--- a/linden/indra/newview/files.lst
+++ b/linden/indra/newview/files.lst
@@ -97,6 +97,7 @@ newview/llfloaterpermissionsmgr.cpp
 newview/llfloaterpostcard.cpp
 newview/llfloaterpreference.cpp
 newview/llfloaterproperties.cpp
+newview/llfloaterreleasemsg.cpp
 newview/llfloaterregioninfo.cpp
 newview/llfloaterreporter.cpp
 newview/llfloatersaveavatar.cpp
diff --git a/linden/indra/newview/gpu_table.txt b/linden/indra/newview/gpu_table.txt
index 74fbe2c..066990b 100644
--- a/linden/indra/newview/gpu_table.txt
+++ b/linden/indra/newview/gpu_table.txt
@@ -25,6 +25,8 @@ ATI Mobility Radeon X1xxx		.*ATI.*Mobility.*X1.*					2
 ATI Mobility Radeon X3xx                .*ATI.*Mobility.*X3.*                                   1
 ATI Mobility Radeon X6xx                .*ATI.*Mobility.*X6.*                                   1
 ATI Mobility Radeon X7xx                .*ATI.*Mobility.*X7.*                                   1
+ATI Mobility Radeon Xxxx                .*ATI.*Mobility.*X.*                                    1
+ATI Mobility Radeon                             .*ATI.*Mobility.*                                               0
 ATI Radeon OpenGL                               .*ATI.*Radeon OpenGL.*                                  3
 ATI Diamond X1xxx                               .*ATI.*Diamond.*X1.*                                    3
 ATI FireGL 5xxx                                 .*ATI.*FireGL V5.*                                              3
diff --git a/linden/indra/newview/linux_tools/client-readme.txt b/linden/indra/newview/linux_tools/client-readme.txt
index e07384c..59ebf67 100644
--- a/linden/indra/newview/linux_tools/client-readme.txt
+++ b/linden/indra/newview/linux_tools/client-readme.txt
@@ -97,6 +97,10 @@ you wish.
 These are the most commonly-encountered known issues which are specific to
 the Alpha release of the Linux client.
+* VOICE COMMUNICATION - this is not yet available in the Linux client.
+* STREAMING MOVIES - these are currently disabled while we work on some issues.
 * VISUAL EFFECTS AND PERFORMANCE - many Linux graphics drivers are not as
  robust as their counterparts for other operating systems, so some advanced
  Second Life graphical features have been DISABLED by default to aid
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index d39fc3a..9adc4d3 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -43,6 +43,9 @@ export LL_GL_BASICEXT=x
 ## - Avoids an often-buggy X feature that doesn't really benefit us anyway.
 export SDL_VIDEO_X11_DGAMOUSE=0
+## - Works around a problem with misconfigured 64-bit systems not finding GL
+export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH}":/usr/lib64/dri:/usr/lib32/dri:/usr/lib/dri
 ## Nothing worth editing below this line.
 ##-------------------------------------------------------------------
@@ -65,7 +68,12 @@ if [ -n "$LL_TCMALLOC" ]; then
        fi
    fi
 fi
-LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}" $LL_WRAPPER bin/do-not-directly-run-secondlife-bin `cat gridargs.dat` $@ | cat
+export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"'
+export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-secondlife-bin'
+export SL_OPT="`cat gridargs.dat` $@"
+eval ${SL_ENV} ${SL_CMD} ${SL_OPT} || echo Unclean shutdown.
 echo
 echo '*********************************************************'
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 3f6ab4f..bf54472 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -5612,7 +5612,7 @@ void LLAgent::teleportCancel()
                sendReliableMessage();
        }       
        gTeleportDisplay = FALSE;
-        gAgent.setTeleportState( LLAgent::TELEPORT_CANCELLING );
+        gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
 }
diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h
index 7fb4571..9c53fe1 100644
--- a/linden/indra/newview/llagent.h
+++ b/linden/indra/newview/llagent.h
@@ -529,8 +529,7 @@ public:
                TELEPORT_REQUESTED = 2,         // Waiting for source simulator to respond
                TELEPORT_MOVING = 3,            // Viewer has received destination location from source simulator
                TELEPORT_START_ARRIVAL = 4,     // Transition to ARRIVING.  Viewer has received avatar update, etc., from destination simulator
-                TELEPORT_ARRIVING = 5,          // Make the user wait while content "pre-caches"
+                TELEPORT_ARRIVING = 5           // Make the user wait while content "pre-caches"
-                TELEPORT_CANCELLING = 6         // used only if user clicks "cancel" button
        };
        ETeleportState  getTeleportState() const                        { return mTeleportState; }
diff --git a/linden/indra/newview/llassetuploadresponders.cpp b/linden/indra/newview/llassetuploadresponders.cpp
index 1d6e27d..efe71e1 100644
--- a/linden/indra/newview/llassetuploadresponders.cpp
+++ b/linden/indra/newview/llassetuploadresponders.cpp
@@ -95,8 +95,8 @@ void LLAssetUploadResponder::error(U32 statusNum, const std::string& reason)
        {
                case 400:
                        args["[FILE]"] = (mFileName.empty() ? mVFileID.asString() : mFileName);
-                        args["[REASON]"] = "Error in upload request.  Please contact "
+                        args["[REASON]"] = "Error in upload request.  Please visit "
-                                "support@lindenlab.com for help fixing this problem.";
+                                "http://secondlife.com/support for help fixing this problem.";
                        gViewerWindow->alertXml("CannotUploadReason", args);
                        break;
                case 500:
diff --git a/linden/indra/newview/llcompilequeue.cpp b/linden/indra/newview/llcompilequeue.cpp
index 12b52c4..2bd2f2d 100644
--- a/linden/indra/newview/llcompilequeue.cpp
+++ b/linden/indra/newview/llcompilequeue.cpp
@@ -366,7 +366,7 @@ void LLFloaterCompileQueue::handleInventory(LLViewerObject *viewer_object,
 // static
 void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
                                                                                  LLAssetType::EType type,
-                                                                                  void* user_data, S32 status)
+                                                                                  void* user_data, S32 status, LLExtStat ext_status)
 {
        llinfos << "LLFloaterCompileQueue::scriptArrived()" << llendl;
        LLScriptQueueData* data = (LLScriptQueueData*)user_data;
@@ -449,7 +449,7 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
 }
 // static
-void LLFloaterCompileQueue::onSaveTextComplete(const LLUUID& asset_id, void* user_data, S32 status) // StoreAssetData callback (fixed)
+void LLFloaterCompileQueue::onSaveTextComplete(const LLUUID& asset_id, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
        llinfos << "LLFloaterCompileQueue::onSaveTextComplete()" << llendl;
        if (status)
@@ -462,7 +462,7 @@ void LLFloaterCompileQueue::onSaveTextComplete(const LLUUID& asset_id, void* use
 }
 // static
-void LLFloaterCompileQueue::onSaveBytecodeComplete(const LLUUID& asset_id, void* user_data, S32 status) // StoreAssetData callback (fixed)
+void LLFloaterCompileQueue::onSaveBytecodeComplete(const LLUUID& asset_id, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
        llinfos << "LLFloaterCompileQueue::onSaveBytecodeComplete()" << llendl;
        LLCompileQueueData* data = (LLCompileQueueData*)user_data;
diff --git a/linden/indra/newview/llcompilequeue.h b/linden/indra/newview/llcompilequeue.h
index c28b92c..cbff4cb 100644
--- a/linden/indra/newview/llcompilequeue.h
+++ b/linden/indra/newview/llcompilequeue.h
@@ -133,12 +133,12 @@ protected:
        // This is the callback for when each script arrives
        static void scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
                                                                LLAssetType::EType type,
-                                                                void* user_data, S32 status);
+                                                                void* user_data, S32 status, LLExtStat ext_status);
-        static void onSaveTextComplete(const LLUUID& asset_id, void* user_data, S32 status);
+        static void onSaveTextComplete(const LLUUID& asset_id, void* user_data, S32 status, LLExtStat ext_status);
        static void onSaveBytecodeComplete(const LLUUID& asset_id,
                                                                           void* user_data,
-                                                                           S32 status);
+                                                                           S32 status, LLExtStat ext_status);
        // compile the file given and save it out.
        void compile(const char* filename, const LLUUID& asset_id);
diff --git a/linden/indra/newview/llconsole.cpp b/linden/indra/newview/llconsole.cpp
index 112f8ab..47d239f 100644
--- a/linden/indra/newview/llconsole.cpp
+++ b/linden/indra/newview/llconsole.cpp
@@ -124,7 +124,7 @@ void LLConsole::draw()
        // skip lines added more than mLinePersistTime ago
        F32 cur_time = mTimer.getElapsedTimeF32();
        
-        if( gStartupState != STATE_STARTED )
+        if( LLStartUp::getStartupState() != STATE_STARTED )
        {
                S32 count = mLines.size();
                S32 i = 0;
diff --git a/linden/indra/newview/llcontroldef.cpp b/linden/indra/newview/llcontroldef.cpp
index dffaa36..351f437 100644
--- a/linden/indra/newview/llcontroldef.cpp
+++ b/linden/indra/newview/llcontroldef.cpp
@@ -49,6 +49,7 @@
 #include "llconsole.h"
 #include "lldrawpoolterrain.h"
 #include "llflexibleobject.h"
+#include "llfeaturemanager.h"
 #include "llglslshader.h"
 #include "llmediaengine.h"
 #include "llpanelgeneral.h"
@@ -356,7 +357,7 @@ void declare_settings()
        gSavedSettings.declareBOOL("ShowPropertyLines", FALSE, "Show line overlay demarking property boundaries");
        gSavedSettings.declareBOOL("ShowParcelOwners", FALSE, "", NO_PERSIST);
        gSavedSettings.declareBOOL("ToolboxAutoMove", FALSE, "[NOT USED]");
-        gSavedSettings.declareBOOL("ToolboxShowMore", FALSE, "", NO_PERSIST);
+        gSavedSettings.declareBOOL("ToolboxShowMore", TRUE, "Whether to show additional build tool controls", TRUE);
        gSavedSettings.declareRect("ToolboxRect", LLRect(0, 100, 100, 100), "Rectangle for tools window" ); // only care about position
@@ -379,7 +380,7 @@ void declare_settings()
        gSavedSettings.declareS32("LastPrefTab", 0, "Last selected tab in preferences window");
-        gSavedSettings.declareString("LSLHelpURL", "http://wiki.secondlife.com/wiki/[LSL_STRING]", "URL that points to LSL help files, with [LSL_STRING] corresponding to the referenced LSL function or keyword");
+        gSavedSettings.declareString("LSLHelpURL", "https://wiki.secondlife.com/wiki/[LSL_STRING]", "URL that points to LSL help files, with [LSL_STRING] corresponding to the referenced LSL function or keyword");
        // link for editable wiki (https doesn't seem to work right now with our embedded browser)
        //gSavedSettings.declareString("LSLHelpURL", "https://wiki.secondlife.com/wiki/[LSL_STRING]", "URL that points to LSL help files, with [LSL_STRING] corresponding to the referenced LSL function or keyword");
        // Wearable default images
@@ -846,6 +847,9 @@ void declare_settings()
        //gSavedSettings.declareU32("LastRAMDetected", 0, "[DO NOT MODIFY] Detected system memory (bytes)");  // used to detect RAM changes
        gSavedSettings.declareBOOL("ImagePipelineUseHTTP", FALSE, "If TRUE use HTTP GET to fetch textures from the server");
+        // Image compression
+        gSavedSettings.declareBOOL("LosslessJ2CUpload", FALSE, "Use lossless compression for small image uploads");
+        
        // Threading
        gSavedSettings.declareBOOL("RunMultipleThreads", FALSE, "If TRUE keep background threads active during render");
@@ -1108,6 +1112,10 @@ void declare_settings()
        // HTML dialog (general purpose)
        gSavedSettings.declareRect("HtmlFloaterRect", LLRect(100,460,370,100), "Rectangle for HTML Floater window");
+        // HTML sim release message floater
+        gSavedSettings.declareRect("HtmlReleaseMessage", LLRect(46,520,400,128), "Rectangle for HTML Release Message Floater window");
+        
        
        // HTML help 
        gSavedSettings.declareString("HtmlHelpLastPage", "", "Last URL visited via help system");
@@ -1810,8 +1818,8 @@ class LLUseOcclusionListener: public LLSimpleListener
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                LLPipeline::sUseOcclusion = (event->getValue().asBoolean() && gGLManager.mHasOcclusionQuery &&
+                LLPipeline::sUseOcclusion = (event->getValue().asBoolean() && gGLManager.mHasOcclusionQuery 
-                        !gUseWireframe);
+                                && gFeatureManagerp->isFeatureAvailable("UseOcclusion") && !gUseWireframe);
                return true;
        }
 };
diff --git a/linden/indra/newview/llcubemap.cpp b/linden/indra/newview/llcubemap.cpp
index 74af3da..ff8f7c3 100644
--- a/linden/indra/newview/llcubemap.cpp
+++ b/linden/indra/newview/llcubemap.cpp
@@ -27,6 +27,7 @@
 */
 #include "llviewerprecompiledheaders.h"
+#include "llfeaturemanager.h"
 #include "llworkerthread.h"
 #include "llcubemap.h"
@@ -65,7 +66,8 @@ void LLCubeMap::initGL()
 {
        llassert(gGLManager.mInited);
-        if (gGLManager.mHasCubeMap)
+        if (gGLManager.mHasCubeMap
+            && gFeatureManagerp->isFeatureAvailable("RenderCubeMap"))
        {
                mTargets[0] = GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB;
                mTargets[1] = GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB;
@@ -174,7 +176,9 @@ GLuint LLCubeMap::getGLName()
 void LLCubeMap::bind()
 {
-        if (gGLManager.mHasCubeMap)
+        if (gGLManager.mHasCubeMap
+            //&& gFeatureManagerp->isFeatureAvailable("RenderCubeMap")
+            )
        {
                // We assume that if they have cube mapping, they have multitexturing.
                glEnable(GL_TEXTURE_CUBE_MAP_ARB);
@@ -192,7 +196,10 @@ void LLCubeMap::bind()
 void LLCubeMap::enable(S32 stage)
 {
        mTextureStage = stage;
-        if (gGLManager.mHasCubeMap && stage >= 0)
+        if (gGLManager.mHasCubeMap &&
+            stage >= 0
+            //&& gFeatureManagerp->isFeatureAvailable("RenderCubeMap")
+            )
        {
                glActiveTextureARB(GL_TEXTURE0_ARB + stage); // NOTE: leaves texture stage set
                
@@ -209,7 +216,9 @@ void LLCubeMap::enable(S32 stage)
 void LLCubeMap::disable()
 {
-        if (gGLManager.mHasCubeMap && mTextureStage >= 0)
+        if (gGLManager.mHasCubeMap && mTextureStage >= 0
+            //&& gFeatureManagerp->isFeatureAvailable("RenderCubeMap")
+            )
        {
                glActiveTextureARB(GL_TEXTURE0_ARB + mTextureStage);
                glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, 0);
diff --git a/linden/indra/newview/lldrawpool.cpp b/linden/indra/newview/lldrawpool.cpp
index 0ab5b54..f1feb4a 100644
--- a/linden/indra/newview/lldrawpool.cpp
+++ b/linden/indra/newview/lldrawpool.cpp
@@ -469,12 +469,14 @@ LLDrawPool* LLRenderPass::instancePool()
 void LLRenderPass::renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture)
 {                                       
-        std::vector<LLDrawInfo*>& draw_info = group->mDrawMap[type];
+        LLSpatialGroup::drawmap_elem_t& draw_info = group->mDrawMap[type];
        
-        for (std::vector<LLDrawInfo*>::const_iterator k = draw_info.begin(); k != draw_info.end(); ++k)
+        for (LLSpatialGroup::drawmap_elem_t::iterator k = draw_info.begin(); k != draw_info.end(); ++k) 
        {
-                LLDrawInfo& params = **k;
+                LLDrawInfo *pparams = *k;
-                pushBatch(params, mask, texture);
+                if (pparams) {
+                        pushBatch(*pparams, mask, texture);
+                }
        }
 }
@@ -484,14 +486,15 @@ void LLRenderPass::renderInvisible(U32 mask)
        LLGLState::checkClientArrays(mask);
 #endif
        
-        std::vector<LLDrawInfo*>& draw_info = gPipeline.mRenderMap[LLRenderPass::PASS_INVISIBLE];
+        LLSpatialGroup::drawmap_elem_t& draw_info = gPipeline.mRenderMap[LLRenderPass::PASS_INVISIBLE]; 
-        for (std::vector<LLDrawInfo*>::iterator i = draw_info.begin(); i != draw_info.end(); ++i)
+        for (LLSpatialGroup::drawmap_elem_t::iterator i = draw_info.begin(); i != draw_info.end(); ++i) 
        {
-                LLDrawInfo& params = **i;
+                
+                LLDrawInfo *pparams = *i;
+                if (pparams && pparams->mVertexBuffer.notNull()) {
+                        LLDrawInfo &params = *pparams;
-                if (params.mVertexBuffer)
-                {
                        params.mVertexBuffer->setBuffer(mask);
                        U32 *indices_pointer =
                                (U32 *) params.mVertexBuffer->getIndicesPointer();
@@ -509,22 +512,19 @@ void LLRenderPass::renderTexture(U32 type, U32 mask)
        LLGLState::checkClientArrays(mask);
 #endif
-        std::vector<LLDrawInfo*>& draw_info = gPipeline.mRenderMap[type];
+        LLSpatialGroup::drawmap_elem_t& draw_info = gPipeline.mRenderMap[type]; 
-        for (std::vector<LLDrawInfo*>::iterator i = draw_info.begin(); i != draw_info.end(); ++i)
+        for (LLSpatialGroup::drawmap_elem_t::iterator i = draw_info.begin(); i != draw_info.end(); ++i) 
        {
-                LLDrawInfo& params = **i;
+                LLDrawInfo* pparams = *i;
-                pushBatch(params, mask, TRUE);
+                if (pparams) {
+                        pushBatch(*pparams, mask, TRUE);
+                }
        }
 }
 void LLRenderPass::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture)
 {
-        if (params.mVertexBuffer.isNull())
-        {
-                return;
-        }
        if (texture)
        {
                if (params.mTexture.notNull())
@@ -542,12 +542,15 @@ void LLRenderPass::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture)
                        LLImageGL::unbindTexture(0);
                }
        }
-        
-        params.mVertexBuffer->setBuffer(mask);
+        if (params.mVertexBuffer.notNull())
-        U32* indices_pointer = (U32*) params.mVertexBuffer->getIndicesPointer();
+        {
-        glDrawRangeElements(GL_TRIANGLES, params.mStart, params.mEnd, params.mCount,
+                params.mVertexBuffer->setBuffer(mask);
-                                                GL_UNSIGNED_INT, indices_pointer+params.mOffset);
+                U32* indices_pointer = (U32*) params.mVertexBuffer->getIndicesPointer();
-        gPipeline.mTrianglesDrawn += params.mCount/3;
+                glDrawRangeElements(GL_TRIANGLES, params.mStart, params.mEnd, params.mCount,
+                                                        GL_UNSIGNED_INT, indices_pointer+params.mOffset);
+                gPipeline.mTrianglesDrawn += params.mCount/3;
+        }
        if (params.mTextureMatrix && texture && params.mTexture.notNull())
        {
diff --git a/linden/indra/newview/lldrawpoolalpha.cpp b/linden/indra/newview/lldrawpoolalpha.cpp
index 8866c1e..a502580 100644
--- a/linden/indra/newview/lldrawpoolalpha.cpp
+++ b/linden/indra/newview/lldrawpoolalpha.cpp
@@ -219,9 +219,9 @@ void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask, std::vector<LLSpatialGroup*
                                last_part = part;
                        }
-                        std::vector<LLDrawInfo*>& draw_info = group->mDrawMap[LLRenderPass::PASS_ALPHA];
+                        LLSpatialGroup::drawmap_elem_t& draw_info = group->mDrawMap[LLRenderPass::PASS_ALPHA];  
-                        for (std::vector<LLDrawInfo*>::const_iterator k = draw_info.begin(); k != draw_info.end(); ++k)
+                        for (LLSpatialGroup::drawmap_elem_t::iterator k = draw_info.begin(); k != draw_info.end(); ++k) 
                        {
                                LLDrawInfo& params = **k;
                                
@@ -245,7 +245,7 @@ void LLDrawPoolAlpha::renderGroupAlpha(LLSpatialGroup* group, U32 type, U32 mask
 {                                       
        BOOL light_enabled = TRUE;
-        std::vector<LLDrawInfo*>& draw_info = group->mDrawMap[type];
+        LLSpatialGroup::drawmap_elem_t& draw_info = group->mDrawMap[type];      
        
        U32 prim_type = GL_TRIANGLES;
@@ -272,7 +272,7 @@ void LLDrawPoolAlpha::renderGroupAlpha(LLSpatialGroup* group, U32 type, U32 mask
                glPointSize(width/(view*view));
        }*/
-        for (std::vector<LLDrawInfo*>::const_iterator k = draw_info.begin(); k != draw_info.end(); ++k)
+        for (LLSpatialGroup::drawmap_elem_t::iterator k = draw_info.begin(); k != draw_info.end(); ++k) 
        {
                LLDrawInfo& params = **k;
                if (texture && params.mTexture.notNull())
diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp
index b0b8b02..a78dc94 100644
--- a/linden/indra/newview/lldrawpoolbump.cpp
+++ b/linden/indra/newview/lldrawpoolbump.cpp
@@ -350,9 +350,9 @@ void LLDrawPoolBump::renderActive(U32 type, U32 mask, BOOL texture)
 void LLDrawPoolBump::renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture = TRUE)
 {                                       
-        std::vector<LLDrawInfo*>& draw_info = group->mDrawMap[type];
+        LLSpatialGroup::drawmap_elem_t& draw_info = group->mDrawMap[type];      
        
-        for (std::vector<LLDrawInfo*>::const_iterator k = draw_info.begin(); k != draw_info.end(); ++k)
+        for (LLSpatialGroup::drawmap_elem_t::iterator k = draw_info.begin(); k != draw_info.end(); ++k) 
        {
                LLDrawInfo& params = **k;
                if (LLPipeline::sDynamicReflections)
@@ -899,9 +899,9 @@ void LLDrawPoolBump::renderBump(U32 type, U32 mask)
        LLGLState::checkClientArrays(mask);
 #endif
-        std::vector<LLDrawInfo*>& draw_info = gPipeline.mRenderMap[type];
+        LLSpatialGroup::drawmap_elem_t& draw_info = gPipeline.mRenderMap[type]; 
-        for (std::vector<LLDrawInfo*>::iterator i = draw_info.begin(); i != draw_info.end(); ++i)
+        for (LLSpatialGroup::drawmap_elem_t::iterator i = draw_info.begin(); i != draw_info.end(); ++i) 
        {
                LLDrawInfo& params = **i;
@@ -914,9 +914,9 @@ void LLDrawPoolBump::renderBump(U32 type, U32 mask)
 void LLDrawPoolBump::renderGroupBump(LLSpatialGroup* group, U32 type, U32 mask)
 {                                       
-        const std::vector<LLDrawInfo*>& draw_info = group->mDrawMap[type];
+        LLSpatialGroup::drawmap_elem_t& draw_info = group->mDrawMap[type];      
        
-        for (std::vector<LLDrawInfo*>::const_iterator k = draw_info.begin(); k != draw_info.end(); ++k)
+        for (LLSpatialGroup::drawmap_elem_t::iterator k = draw_info.begin(); k != draw_info.end(); ++k) 
        {
                LLDrawInfo& params = **k;
                
diff --git a/linden/indra/newview/lldrawpoolwater.cpp b/linden/indra/newview/lldrawpoolwater.cpp
index 100eb43..035cb56 100644
--- a/linden/indra/newview/lldrawpoolwater.cpp
+++ b/linden/indra/newview/lldrawpoolwater.cpp
@@ -92,8 +92,8 @@ LLDrawPool *LLDrawPoolWater::instancePool()
 void LLDrawPoolWater::prerender()
 {
-        mVertexShaderLevel = gSavedSettings.getBOOL("RenderRippleWater") ?
+        mVertexShaderLevel = (gSavedSettings.getBOOL("RenderRippleWater") && gGLManager.mHasCubeMap && gFeatureManagerp->isFeatureAvailable("RenderCubeMap")) ?
-                                LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_ENVIRONMENT) : 0;
+                LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_ENVIRONMENT) : 0;
 }
@@ -565,7 +565,7 @@ void LLDrawPoolWater::shade()
        LLCubeMap* skyMap = gSky.mVOSkyp->getCubeMap();
        
        gWaterProgram.enableTexture(LLShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
-    skyMap->bind();
+        skyMap->bind();
        //bind normal map
        S32 bumpTex = gWaterProgram.enableTexture(LLShaderMgr::BUMP_MAP);
diff --git a/linden/indra/newview/lldynamictexture.cpp b/linden/indra/newview/lldynamictexture.cpp
index 4944415..57f4def 100644
--- a/linden/indra/newview/lldynamictexture.cpp
+++ b/linden/indra/newview/lldynamictexture.cpp
@@ -205,8 +205,6 @@ BOOL LLDynamicTexture::updateAllInstances()
                return TRUE;
        }
-        BOOL started = FALSE;
-                
        BOOL result = FALSE;
        for( S32 order = 0; order < ORDER_COUNT; order++ )
        {
@@ -215,29 +213,22 @@ BOOL LLDynamicTexture::updateAllInstances()
                        dynamicTexture = LLDynamicTexture::sInstances[order].getNextData())
                {
                        if (dynamicTexture->needsRender())
-                        {
+                        {       
-                                if (!started)
+                                dynamicTexture->preRender();    // Must be called outside of startRender()
-                                {
-                                        started = TRUE;
+                                LLVertexBuffer::startRender();
-                                        LLVertexBuffer::startRender();
-                                }
-                                
-                                dynamicTexture->preRender();
                                if (dynamicTexture->render())
                                {
                                        result = TRUE;
                                        sNumRenders++;
                                }
+                                LLVertexBuffer::stopRender();
+                
                                dynamicTexture->postRender(result);
                        }
                }
        }
-        if (started)
-        {
-                LLVertexBuffer::stopRender();
-        }
-        
        return result;
 }
diff --git a/linden/indra/newview/llfeaturemanager.cpp b/linden/indra/newview/llfeaturemanager.cpp
index 8bcbc1e..93450b4 100644
--- a/linden/indra/newview/llfeaturemanager.cpp
+++ b/linden/indra/newview/llfeaturemanager.cpp
@@ -402,7 +402,7 @@ void LLFeatureManager::cleanupFeatureTables()
 void LLFeatureManager::initCPUFeatureMasks()
 {
-        if (gSysMemory.getPhysicalMemory() <= 256*1024*1024)
+        if (gSysMemory.getPhysicalMemoryClamped() <= 256*1024*1024)
        {
                maskFeatures("RAM256MB");
        }
@@ -494,7 +494,7 @@ extern LLOSInfo gSysOS;
 void LLFeatureManager::applyRecommendedFeatures()
 {
-        // see featuretable.txt
+        // see featuretable.txt / featuretable_linux.txt / featuretable_mac.txt
        llinfos << "Applying Recommended Features" << llendl;
 #ifndef LL_RELEASE_FOR_DOWNLOAD
@@ -544,6 +544,10 @@ void LLFeatureManager::applyRecommendedFeatures()
        // RippleWater
        BOOL ripple = getRecommendedLevel("RenderRippleWater");
        gSavedSettings.setBOOL("RenderRippleWater", ripple);
+        // Occlusion Culling
+        BOOL occlusion = getRecommendedLevel("UseOcclusion");
+        gSavedSettings.setBOOL("UseOcclusion", occlusion);
        
        // Vertex Shaders
        S32 shaders = getRecommendedLevel("VertexShaderEnable");
diff --git a/linden/indra/newview/llflexibleobject.cpp b/linden/indra/newview/llflexibleobject.cpp
index 836cfdc..454b40f 100644
--- a/linden/indra/newview/llflexibleobject.cpp
+++ b/linden/indra/newview/llflexibleobject.cpp
@@ -643,6 +643,15 @@ BOOL LLVolumeImplFlexible::doUpdateGeometry(LLDrawable *drawable)
        volume->updateRelativeXform();
        doFlexibleUpdate();
        
+        // Object may have been rotated, which means it needs a rebuild.  See SL-47220
+        BOOL    rotated = FALSE;
+        LLQuaternion cur_rotation = getFrameRotation();
+        if ( cur_rotation != mLastFrameRotation )
+        {
+                mLastFrameRotation = cur_rotation;
+                rotated = TRUE;
+        }
        if (volume->mLODChanged || volume->mFaceMappingChanged ||
                volume->mVolumeChanged)
        {
@@ -650,7 +659,7 @@ BOOL LLVolumeImplFlexible::doUpdateGeometry(LLDrawable *drawable)
                volume->mDrawable->setState(LLDrawable::REBUILD_VOLUME);
        }
-        if (!mUpdated || volume->mFaceMappingChanged || volume->mVolumeChanged)
+        if (!mUpdated || volume->mFaceMappingChanged || volume->mVolumeChanged || rotated)
        {
                doFlexibleRebuild();
                volume->genBBoxes(isVolumeGlobal());
diff --git a/linden/indra/newview/llflexibleobject.h b/linden/indra/newview/llflexibleobject.h
index f3da5bb..df2e4ac 100644
--- a/linden/indra/newview/llflexibleobject.h
+++ b/linden/indra/newview/llflexibleobject.h
@@ -117,7 +117,7 @@ class LLVolumeImplFlexible : public LLVolumeInterface
                LLVector3                                       mAnchorPosition;
                LLVector3                                       mParentPosition;
                LLQuaternion                            mParentRotation;
-                LLQuaternion                            mInitialAxisRotation;
+                LLQuaternion                            mLastFrameRotation;
                LLQuaternion                            mLastSegmentRotation;
                BOOL                                            mInitialized;
                BOOL                                            mUpdated;
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index cc3bb08..b259455 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -41,7 +41,7 @@
 #include "llagent.h"
 #include "llviewerstats.h"
 #include "llviewerregion.h"
-#include "llversion.h"
+#include "llversionviewer.h"
 #include "llviewerbuild.h"
 #include "llvieweruictrlfactory.h"
 #include "viewer.h"     // for gViewerDigest
@@ -109,7 +109,9 @@ LLFloaterAbout::LLFloaterAbout()
                support.append(" (");
                gAgent.getRegion()->getHost().getString(buffer, MAX_STRING);
                support.append(buffer);
-                support.append(")\n\n");
+                support.append(")\n");
+                support.append(gLastVersionChannel);
+                support.append("\n\n");
        }
        // CPU
@@ -117,9 +119,8 @@ LLFloaterAbout::LLFloaterAbout()
        support.append( gSysCPU.getCPUString() );
        support.append("\n");
-        U32 memory = gSysMemory.getPhysicalMemory() / 1024 / 1024;
+        U32 memory = gSysMemory.getPhysicalMemoryKB() / 1024;
-        // For some reason, the reported amount of memory is always wrong by one meg
+        // Moved hack adjustment to Windows memory size into llsys.cpp
-        memory++;
        LLString mem_text = llformat("Memory: %u MB\n", memory );
        support.append(mem_text);
@@ -165,8 +166,15 @@ LLFloaterAbout::LLFloaterAbout()
        // Fix views
        childDisable("credits_editor");
-        childDisable("support_editor");
-        childSetText("support_editor", support);
+        LLTextEditor * support_widget = (LLTextEditor *) getChildByName("support_editor", true);
+        if (support_widget)
+        {
+                support_widget->setEnabled( FALSE );
+                support_widget->setTakesFocus( TRUE );
+                support_widget->setText( support );
+                support_widget->setHandleEditKeysDirectly( TRUE );
+        }
        center();
diff --git a/linden/indra/newview/llfloateranimpreview.h b/linden/indra/newview/llfloateranimpreview.h
index c536fb5..68cd3d5 100644
--- a/linden/indra/newview/llfloateranimpreview.h
+++ b/linden/indra/newview/llfloateranimpreview.h
@@ -102,7 +102,7 @@ public:
        static void onSaveComplete(const LLUUID& asset_uuid,
                                                                           LLAssetType::EType type,
                                                                           void* user_data,
-                                                                           S32 status);
+                                                                           S32 status, LLExtStat ext_status);
 protected:
        void                    draw();
        void                    resetMotion();
diff --git a/linden/indra/newview/llfloaterauction.cpp b/linden/indra/newview/llfloaterauction.cpp
index 49da8ba..e024bde 100644
--- a/linden/indra/newview/llfloaterauction.cpp
+++ b/linden/indra/newview/llfloaterauction.cpp
@@ -55,9 +55,9 @@
 ///----------------------------------------------------------------------------
 void auction_j2c_upload_done(const LLUUID& asset_id,
-                                                           void* user_data, S32 status);
+                                                           void* user_data, S32 status, LLExtStat ext_status);
 void auction_tga_upload_done(const LLUUID& asset_id,
-                                                           void* user_data, S32 status);
+                                                           void* user_data, S32 status, LLExtStat ext_status);
 ///----------------------------------------------------------------------------
 /// Class llfloaterauction
@@ -258,7 +258,7 @@ void LLFloaterAuction::onClickOK(void* data)
 /// Local function definitions
 ///----------------------------------------------------------------------------
-void auction_tga_upload_done(const LLUUID& asset_id, void* user_data, S32 status) // StoreAssetData callback (fixed)
+void auction_tga_upload_done(const LLUUID& asset_id, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
        LLString* name = (LLString*)(user_data);
        llinfos << "Upload of asset '" << *name << "' " << asset_id
@@ -279,7 +279,7 @@ void auction_tga_upload_done(const LLUUID& asset_id, void* user_data, S32 status
        }
 }
-void auction_j2c_upload_done(const LLUUID& asset_id, void* user_data, S32 status) // StoreAssetData callback (fixed)
+void auction_j2c_upload_done(const LLUUID& asset_id, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
        LLString* name = (LLString*)(user_data);
        llinfos << "Upload of asset '" << *name << "' " << asset_id
diff --git a/linden/indra/newview/llfloateravatarpicker.cpp b/linden/indra/newview/llfloateravatarpicker.cpp
index 3bb2462..16c15b0 100644
--- a/linden/indra/newview/llfloateravatarpicker.cpp
+++ b/linden/indra/newview/llfloateravatarpicker.cpp
@@ -197,29 +197,33 @@ void LLFloaterAvatarPicker::onList(LLUICtrl* ctrl, void* userdata)
        }
 }
+// static callback for inventory picker (select from calling cards)
 void LLFloaterAvatarPicker::onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data)
 {
        LLFloaterAvatarPicker* self = (LLFloaterAvatarPicker*)data;
-        if (!self)
+        if (self)
        {
-                return;
+                self->doSelectionChange( items, user_action, data );
        }
+}
-        self->mAvatarIDs.clear();
+// Callback for inventory picker (select from calling cards)
-        self->mAvatarNames.clear();
+void LLFloaterAvatarPicker::doSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data)
+{
-        // if we have calling cards, disable select button until 
+        if (!mListNames)
-        // the inventory picks a valid calling card
-        if (!items.empty())
        {
-                self->childSetEnabled("Select", FALSE);
+                return;
        }
-        if (!self->mListNames)
+        std::vector<LLScrollListItem*> search_items = mListNames->getAllSelected();
-        {
+        if ( search_items.size() == 0 )
-                return;
+        {       // Nothing selected in the search results
+                mAvatarIDs.clear();
+                mAvatarNames.clear();
+                childSetEnabled("Select", FALSE);
        }
-        
+        BOOL    first_calling_card = TRUE;
        std::deque<LLFolderViewItem*>::const_iterator item_it;
        for (item_it = items.begin(); item_it != items.end(); ++item_it)
        {
@@ -230,10 +234,18 @@ void LLFloaterAvatarPicker::onSelectionChange(const std::deque<LLFolderViewItem*
                        if (item)
                        {
-                                self->mAvatarIDs.push_back(item->getCreatorUUID());
+                                if ( first_calling_card )
-                                self->mAvatarNames.push_back(listenerp->getName());
+                                {       // Have a calling card selected, so clear anything from the search panel
-                                self->childSetEnabled("Select", TRUE);
+                                        first_calling_card = FALSE;
-                                self->mListNames->deselectAllItems();
+                                        mAvatarIDs.clear();
+                                        mAvatarNames.clear();
+                                        mListNames->deselectAllItems();
+                                }
+                                // Add calling card info to the selected avatars
+                                mAvatarIDs.push_back(item->getCreatorUUID());
+                                mAvatarNames.push_back(listenerp->getName());
+                                childSetEnabled("Select", TRUE);
                        }
                }
        }
diff --git a/linden/indra/newview/llfloateravatarpicker.h b/linden/indra/newview/llfloateravatarpicker.h
index 9089c9a..f9326ad 100644
--- a/linden/indra/newview/llfloateravatarpicker.h
+++ b/linden/indra/newview/llfloateravatarpicker.h
@@ -64,6 +64,8 @@ protected:
        static void onBtnAdd(void* userdata);
        static void onBtnClose(void* userdata);
        static void onList(LLUICtrl* ctrl, void* userdata);
+        
+                   void doSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data);
        static void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data);
        void find();
diff --git a/linden/indra/newview/llfloatercustomize.cpp b/linden/indra/newview/llfloatercustomize.cpp
index 41bd8d7..3c5c9a5 100644
--- a/linden/indra/newview/llfloatercustomize.cpp
+++ b/linden/indra/newview/llfloatercustomize.cpp
@@ -379,6 +379,7 @@ public:
        virtual BOOL            postBuild();
        virtual void            draw();
+        virtual BOOL            isDirty() const;        // LLUICtrl
        
        void                            addSubpart(const LLString& name, ESubpart id, LLSubpart* part );
        void                            addTextureDropTarget( LLVOAvatar::ETextureIndex te, const LLString& name, const LLUUID& default_image_id, BOOL allow_no_texture );
@@ -395,7 +396,6 @@ public:
        void                            setWearable(LLWearable* wearable, U32 perm_mask, BOOL is_complete);
        void                            addVisualParamToUndoBuffer( S32 param_id, F32 current_weight );
-        BOOL                            isDirty();
        void                            setUIPermissions(U32 perm_mask, BOOL is_complete);
        
@@ -558,6 +558,7 @@ void LLPanelEditWearable::setSubpart( ESubpart subpart )
                        sorted_params.insert(vt);
                }
                gFloaterCustomize->generateVisualParamHints(NULL, sorted_params);
+                gFloaterCustomize->updateScrollingPanelUI();
                // Update the camera
@@ -1030,7 +1031,7 @@ void LLPanelEditWearable::setVisible(BOOL visible)
        }
 }
-BOOL LLPanelEditWearable::isDirty()
+BOOL LLPanelEditWearable::isDirty() const
 {
        LLWearable* wearable = gAgent.getWearable( mType );
        if( !wearable )
@@ -2148,7 +2149,7 @@ void LLFloaterCustomize::draw()
        }
 }
-BOOL LLFloaterCustomize::isDirty()
+BOOL LLFloaterCustomize::isDirty() const
 {
        for(S32 i = 0; i < WT_COUNT; i++)
        {
diff --git a/linden/indra/newview/llfloatercustomize.h b/linden/indra/newview/llfloatercustomize.h
index 6eccdcc..a24dc39 100644
--- a/linden/indra/newview/llfloatercustomize.h
+++ b/linden/indra/newview/llfloatercustomize.h
@@ -95,7 +95,7 @@ public:
        //const char*           getWearableDescription( EWearableType type );
        LLPanelEditWearable* getCurrentWearablePanel() { return mWearablePanelList[ sCurrentWearableType ]; }
-        BOOL                    isDirty();
+        virtual BOOL    isDirty() const;
        void                    askToSaveAllIfDirty( void(*next_step_callback)(BOOL proceed, void* userdata), void* userdata );
diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp
index 3a05715..2e54166 100644
--- a/linden/indra/newview/llfloaterdirectory.cpp
+++ b/linden/indra/newview/llfloaterdirectory.cpp
@@ -209,7 +209,8 @@ void* LLFloaterDirectory::createClassifiedDetail(void* userdata)
 void*   LLFloaterDirectory::createPanelAvatar(void*     data)
 {
        LLFloaterDirectory* self = (LLFloaterDirectory*)data;
-        self->mPanelAvatarp = new LLPanelAvatar("Avatar", LLRect(), TRUE); // allow edit self
+        self->mPanelAvatarp = new LLPanelAvatar("Avatar", LLRect(), 
+                FALSE); // disallow editing in search context (SL-48632)
        self->mPanelAvatarp->setVisible(FALSE);
        return self->mPanelAvatarp;
diff --git a/linden/indra/newview/llfloaterfriends.cpp b/linden/indra/newview/llfloaterfriends.cpp
index 78447e9..67803e1 100644
--- a/linden/indra/newview/llfloaterfriends.cpp
+++ b/linden/indra/newview/llfloaterfriends.cpp
@@ -93,12 +93,13 @@ LLPanelFriends::~LLPanelFriends()
        delete mObserver;
 }
-void LLPanelFriends::tick()
+BOOL LLPanelFriends::tick()
 {
        mEventTimer.stop();
        mPeriod = 1000000;
        mAllowRightsChange = TRUE;
        updateFriends(LLFriendObserver::ADD);
+        return FALSE;
 }
 void LLPanelFriends::updateFriends(U32 changed_mask)
diff --git a/linden/indra/newview/llfloaterfriends.h b/linden/indra/newview/llfloaterfriends.h
index 0b6646d..cf7451f 100644
--- a/linden/indra/newview/llfloaterfriends.h
+++ b/linden/indra/newview/llfloaterfriends.h
@@ -57,7 +57,7 @@ public:
         * current instantiation of this floater. There is only once since
         * you can currently only look at your local friends.
         */
-        virtual void tick();
+        virtual BOOL tick();
        /** 
         * @brief This method is called in response to the LLAvatarTracker
diff --git a/linden/indra/newview/llfloatergodtools.cpp b/linden/indra/newview/llfloatergodtools.cpp
index 7376bba..b858003 100644
--- a/linden/indra/newview/llfloatergodtools.cpp
+++ b/linden/indra/newview/llfloatergodtools.cpp
@@ -1419,7 +1419,7 @@ void LLPanelRequestTools::onClickRequest(void* data)
        }
 }
-void terrain_download_done(void** data, S32 status)
+void terrain_download_done(void** data, S32 status, LLExtStat ext_status)
 {
        LLNotifyBox::showXml("TerrainDownloaded");
 }
diff --git a/linden/indra/newview/llfloatergroupinfo.cpp b/linden/indra/newview/llfloatergroupinfo.cpp
index 3e8eae5..6187692 100644
--- a/linden/indra/newview/llfloatergroupinfo.cpp
+++ b/linden/indra/newview/llfloatergroupinfo.cpp
@@ -109,7 +109,7 @@ void LLFloaterGroupInfo::closeGroup(const LLUUID& group_id)
                {
                        fgi->mPanelGroupp->close();
                }
-                }
+        }
 }
 // static
@@ -125,9 +125,9 @@ void LLFloaterGroupInfo::refreshGroup(const LLUUID& group_id)
        if (fgi)
        {
                if (fgi->mPanelGroupp)
-        {
+                {
                        fgi->mPanelGroupp->refreshData();
-        }
+                }
        }
 }
@@ -190,9 +190,9 @@ void LLFloaterGroupInfo::showNotice(const char* subject,
        {
                // We need to clean up that inventory offer.
                if (inventory_offer)
-        {
+                {
                        inventory_offer_callback( IOR_DECLINE , inventory_offer); 
-        }
+                }
                return;
        }
@@ -202,9 +202,9 @@ void LLFloaterGroupInfo::showNotice(const char* subject,
        {
                // We need to clean up that inventory offer.
                if (inventory_offer)
-        {
+                {
                        inventory_offer_callback( IOR_DECLINE , inventory_offer); 
-        }
+                }
                return;
        }
        
diff --git a/linden/indra/newview/llfloatergroupinvite.cpp b/linden/indra/newview/llfloatergroupinvite.cpp
index a6d81ec..3ff95dc 100644
--- a/linden/indra/newview/llfloatergroupinvite.cpp
+++ b/linden/indra/newview/llfloatergroupinvite.cpp
@@ -107,7 +107,7 @@ LLFloaterGroupInvite::~LLFloaterGroupInvite()
 }
 // static
-void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id)
+void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUUID> *agent_ids)
 {
        // Make sure group_id isn't null
        if (group_id.isNull())
@@ -131,6 +131,11 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id)
                fgi->mImpl->mInvitePanelp->clear();
        }
+        if (agent_ids != NULL)
+        {
+                fgi->mImpl->mInvitePanelp->addUsers(*agent_ids);
+        }
        
        fgi->center();
        fgi->open();    /*Flawfinder: ignore*/
diff --git a/linden/indra/newview/llfloatergroupinvite.h b/linden/indra/newview/llfloatergroupinvite.h
index c61adee..3ad0bf2 100644
--- a/linden/indra/newview/llfloatergroupinvite.h
+++ b/linden/indra/newview/llfloatergroupinvite.h
@@ -39,7 +39,7 @@ class LLFloaterGroupInvite
 public:
        virtual ~LLFloaterGroupInvite();
-        static void showForGroup(const LLUUID &group_id);
+        static void showForGroup(const LLUUID &group_id, std::vector<LLUUID> *agent_ids = NULL);
 protected:
        LLFloaterGroupInvite(const std::string& name,
diff --git a/linden/indra/newview/llfloatergroups.cpp b/linden/indra/newview/llfloatergroups.cpp
index 74526e1..5a442be 100644
--- a/linden/indra/newview/llfloatergroups.cpp
+++ b/linden/indra/newview/llfloatergroups.cpp
@@ -38,6 +38,7 @@
 #include "llfloatergroups.h"
 #include "message.h"
+#include "roles_constants.h"
 #include "llagent.h"
 #include "llbutton.h"
@@ -56,7 +57,7 @@
 std::map<const LLUUID, LLFloaterGroupPicker*> LLFloaterGroupPicker::sInstances;
 // helper functions
-void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id);
+void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 powers_mask = GP_ALL_POWERS);
 ///----------------------------------------------------------------------------
 /// Class LLFloaterGroupPicker
@@ -83,7 +84,8 @@ LLFloaterGroupPicker* LLFloaterGroupPicker::createInstance(const LLSD &seed)
 LLFloaterGroupPicker::LLFloaterGroupPicker(const LLSD& seed) : 
        mSelectCallback(NULL),
-        mCallbackUserdata(NULL)
+        mCallbackUserdata(NULL),
+        mPowersMask(GP_ALL_POWERS)
 {
        mID = seed.asUUID();
        sInstances.insert(std::make_pair(mID, this));
@@ -101,9 +103,16 @@ void LLFloaterGroupPicker::setSelectCallback(void (*callback)(LLUUID, void*),
        mCallbackUserdata = userdata;
 }
+void LLFloaterGroupPicker::setPowersMask(U64 powers_mask)
+{
+        mPowersMask = powers_mask;
+        postBuild();
+}
 BOOL LLFloaterGroupPicker::postBuild()
 {
-        init_group_list(LLUICtrlFactory::getScrollListByName(this, "group list"), gAgent.getGroupID());
+        init_group_list(LLUICtrlFactory::getScrollListByName(this, "group list"), gAgent.getGroupID(), mPowersMask);
        childSetAction("OK", onBtnOK, this);
@@ -414,7 +423,7 @@ void LLPanelGroups::onGroupList(LLUICtrl* ctrl, void* userdata)
        if(self) self->enableButtons();
 }
-void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id)
+void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 powers_mask)
 {
        S32 count = gAgent.mGroups.count();
        LLUUID id;
@@ -427,20 +436,22 @@ void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id)
        {
                id = gAgent.mGroups.get(i).mID;
                LLGroupData* group_datap = &gAgent.mGroups.get(i);
-                LLString style = "NORMAL";
+                if ((group_datap->mPowers & powers_mask) != 0) {
-                if(highlight_id == id)
+                        LLString style = "NORMAL";
-                {
+                        if(highlight_id == id)
-                        style = "BOLD";
+                        {
+                                style = "BOLD";
+                        }
+                        LLSD element;
+                        element["id"] = id;
+                        element["columns"][0]["column"] = "name";
+                        element["columns"][0]["value"] = group_datap->mName;
+                        element["columns"][0]["font"] = "SANSSERIF";
+                        element["columns"][0]["font-style"] = style;
+                        group_list->addElement(element, ADD_SORTED);
                }
-                LLSD element;
-                element["id"] = id;
-                element["columns"][0]["column"] = "name";
-                element["columns"][0]["value"] = group_datap->mName;
-                element["columns"][0]["font"] = "SANSSERIF";
-                element["columns"][0]["font-style"] = style;
-                group_list->addElement(element, ADD_SORTED);
        }
        // add "none" to list at top
diff --git a/linden/indra/newview/llfloatergroups.h b/linden/indra/newview/llfloatergroups.h
index ed5b8b2..496a9fb 100644
--- a/linden/indra/newview/llfloatergroups.h
+++ b/linden/indra/newview/llfloatergroups.h
@@ -57,6 +57,7 @@ public:
        ~LLFloaterGroupPicker();
        void setSelectCallback( void (*callback)(LLUUID, void*), 
                                                        void* userdata);
+        void setPowersMask(U64 powers_mask);
        BOOL postBuild();
 protected:
@@ -69,6 +70,7 @@ protected:
 protected:
        LLUUID mID;
+        U64 mPowersMask;
        void (*mSelectCallback)(LLUUID id, void* userdata);
        void* mCallbackUserdata;
diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp
index 0a91563..554555d 100644
--- a/linden/indra/newview/llfloaterimagepreview.cpp
+++ b/linden/indra/newview/llfloaterimagepreview.cpp
@@ -50,6 +50,7 @@
 #include "pipeline.h"
 #include "viewer.h"
 #include "llvieweruictrlfactory.h"
+#include "llviewerimagelist.h"
 //static
 S32 LLFloaterImagePreview::sUploadAmount = 10;
@@ -57,9 +58,10 @@ S32 LLFloaterImagePreview::sUploadAmount = 10;
 const S32 PREVIEW_BORDER_WIDTH = 2;
 const S32 PREVIEW_RESIZE_HANDLE_SIZE = S32(RESIZE_HANDLE_WIDTH * OO_SQRT2) + PREVIEW_BORDER_WIDTH;
 const S32 PREVIEW_HPAD = PREVIEW_RESIZE_HANDLE_SIZE;
-const S32 PREF_BUTTON_HEIGHT = 16;
+const S32 PREF_BUTTON_HEIGHT = 16 + 7 + 16;
 const S32 PREVIEW_TEXTURE_HEIGHT = 300;
 //-----------------------------------------------------------------------------
 // LLFloaterImagePreview()
 //-----------------------------------------------------------------------------
@@ -106,6 +108,10 @@ BOOL LLFloaterImagePreview::postBuild()
                mSculptedPreview = new LLImagePreviewSculpted(256, 256);
                mSculptedPreview->setPreviewTarget(mRawImagep, 2.0f);
+                if ((mRawImagep->getWidth() <= LL_IMAGE_REZ_LOSSLESS_CUTOFF) &&
+                        (mRawImagep->getHeight() <= LL_IMAGE_REZ_LOSSLESS_CUTOFF))
+                        childEnable("lossless_check");
        }
        else
        {
@@ -763,6 +769,7 @@ LLImagePreviewSculpted::LLImagePreviewSculpted(S32 width, S32 height) : LLDynami
        LLVolumeParams volume_params;
        volume_params.setType(LL_PCODE_PROFILE_CIRCLE, LL_PCODE_PATH_CIRCLE);
+        volume_params.setSculptID(LLUUID::null, LL_SCULPT_TYPE_SPHERE);
        mVolume = new LLVolume(volume_params, (F32) MAX_LOD);
        /*
diff --git a/linden/indra/newview/llfloaterimport.cpp b/linden/indra/newview/llfloaterimport.cpp
index f30f69d..7340c49 100644
--- a/linden/indra/newview/llfloaterimport.cpp
+++ b/linden/indra/newview/llfloaterimport.cpp
@@ -510,7 +510,7 @@ void LLFloaterImport::finishImport(ImportAssetInfo *info)
 }
 // static
-void LLFloaterImport::asset_uploaded_callback(const LLUUID& uuid, void* user_data, S32 result)
+void LLFloaterImport::asset_uploaded_callback(const LLUUID& uuid, void* user_data, S32 result, LLExtStat ext_status)
 {
        llinfos << "LLFloaterImport: Finished uploading image." << llendl;
        LLResourceData *resource_data = (LLResourceData*)user_data;
diff --git a/linden/indra/newview/llfloaterimport.h b/linden/indra/newview/llfloaterimport.h
index 518ddc4..9ac005f 100644
--- a/linden/indra/newview/llfloaterimport.h
+++ b/linden/indra/newview/llfloaterimport.h
@@ -100,7 +100,7 @@ protected:
        static void             onBtnOK(void*);
        static void             onBtnCancel(void*);
-        static void asset_uploaded_callback(const LLUUID& uuid, void* user_data, S32 result);
+        static void asset_uploaded_callback(const LLUUID& uuid, void* user_data, S32 result, LLExtStat ext_status);
        static void finishImport(ImportAssetInfo *fp);
        void draw();
diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index c926afa..f494251 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -55,10 +55,10 @@ LLFloaterInspect::~LLFloaterInspect(void)
        {
                if(gToolMgr->getBaseTool() == gToolInspect)
                {
-                        select_tool(gToolNull);
+                        gToolMgr->clearTransientTool();
                }
                // Switch back to basic toolset
-                gToolMgr->setCurrentToolset(gBasicToolset);
+                gToolMgr->setCurrentToolset(gBasicToolset);     
        }
        else
        {
@@ -85,7 +85,7 @@ void LLFloaterInspect::show(void* ignored)
        }
        sInstance->open();
-        select_tool(gToolInspect);
+        gToolMgr->setTransientTool(gToolInspect);
        gSelectMgr->setForceSelection(forcesel);        // restore previouis value
        sInstance->mObjectSelection = gSelectMgr->getSelection();
@@ -256,7 +256,7 @@ void LLFloaterInspect::refresh()
 void LLFloaterInspect::onFocusReceived()
 {
-        select_tool(gToolInspect);
+        gToolMgr->setTransientTool(gToolInspect);
 }
 void LLFloaterInspect::dirty()
diff --git a/linden/indra/newview/llfloaterpostcard.cpp b/linden/indra/newview/llfloaterpostcard.cpp
index 24344bf..94ff5ed 100644
--- a/linden/indra/newview/llfloaterpostcard.cpp
+++ b/linden/indra/newview/llfloaterpostcard.cpp
@@ -291,7 +291,7 @@ void LLFloaterPostcard::onClickPublishHelp(void* data)
 }
 // static
-void LLFloaterPostcard::uploadCallback(const LLUUID& asset_id, void *user_data, S32 result) // StoreAssetData callback (fixed)
+void LLFloaterPostcard::uploadCallback(const LLUUID& asset_id, void *user_data, S32 result, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
        LLFloaterPostcard *self = (LLFloaterPostcard *)user_data;
        
diff --git a/linden/indra/newview/llfloaterpostcard.h b/linden/indra/newview/llfloaterpostcard.h
index 33a5e92..2c5327e 100644
--- a/linden/indra/newview/llfloaterpostcard.h
+++ b/linden/indra/newview/llfloaterpostcard.h
@@ -58,7 +58,7 @@ public:
        static void uploadCallback(const LLUUID& asset_id,
                                                           void *user_data,
-                                                           S32 result);
+                                                           S32 result, LLExtStat ext_status);
        static void updateUserInfo(const char *email);
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index 571bcac..f7c05b5 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -1483,13 +1483,15 @@ void LLPanelEstateInfo::onClickAddEstateManager(void* user_data)
        LLCtrlListInterface *list = self->childGetListInterface("estate_manager_name_list");
        if (!list) return;
        if (list->getItemCount() >= ESTATE_MAX_MANAGERS)
-        {
+        {       // Tell user they can't add more managers
                LLString::format_map_t args;
                args["[MAX_MANAGER]"] = llformat("%d",ESTATE_MAX_MANAGERS);
                gViewerWindow->alertXml("MaxManagersOnRegion", args);
-                return;
        }
-        accessAddCore(ESTATE_ACCESS_MANAGER_ADD, "EstateManagerAdd");
+        else
+        {       // Go pick managers to add
+                accessAddCore(ESTATE_ACCESS_MANAGER_ADD, "EstateManagerAdd");
+        }
 }
 // static
@@ -1995,7 +1997,7 @@ BOOL LLPanelEstateInfo::postBuild()
        if (manager_name_list)
        {
                manager_name_list->setCommitOnSelectionChange(TRUE);
-                manager_name_list->setMaxItemCount(ESTATE_MAX_MANAGERS);
+                manager_name_list->setMaxItemCount(ESTATE_MAX_MANAGERS * 4);    // Allow extras for dupe issue
        }
        childSetAction("add_estate_manager_btn", onClickAddEstateManager, this);
@@ -2562,7 +2564,7 @@ void LLPanelEstateCovenant::loadInvItem(LLInventoryItem *itemp)
 void LLPanelEstateCovenant::onLoadComplete(LLVFS *vfs,
                                                                           const LLUUID& asset_uuid,
                                                                           LLAssetType::EType type,
-                                                                           void* user_data, S32 status)
+                                                                           void* user_data, S32 status, LLExtStat ext_status)
 {
        llinfos << "LLPanelEstateCovenant::onLoadComplete()" << llendl;
        LLPanelEstateCovenant* panelp = (LLPanelEstateCovenant*)user_data;
@@ -2973,9 +2975,13 @@ bool LLDispatchSetEstateAccess::operator()(
                LLNameListCtrl* estate_manager_name_list =
                        LLViewerUICtrlFactory::getNameListByName(panel, "estate_manager_name_list");
                if (estate_manager_name_list)
-                {
+                {       
-                        estate_manager_name_list->deleteAllItems();
+                        estate_manager_name_list->deleteAllItems();             // Clear existing entries
-                        for (S32 i = 0; i < num_estate_managers && i < ESTATE_MAX_MANAGERS; i++)
+                        // There should be only ESTATE_MAX_MANAGERS people in the list, but if the database gets more (SL-46107) don't 
+                        // truncate the list unless it's really big.  Go ahead and show the extras so the user doesn't get confused, 
+                        // and they can still remove them.
+                        for (S32 i = 0; i < num_estate_managers && i < (ESTATE_MAX_MANAGERS * 4); i++)
                        {
                                LLUUID id;
                                memcpy(id.mData, strings[index++].data(), UUID_BYTES);          /* Flawfinder: ignore */
diff --git a/linden/indra/newview/llfloaterregioninfo.h b/linden/indra/newview/llfloaterregioninfo.h
index cd550ff..6c53a7d 100644
--- a/linden/indra/newview/llfloaterregioninfo.h
+++ b/linden/indra/newview/llfloaterregioninfo.h
@@ -369,7 +369,7 @@ public:
        static void onLoadComplete(LLVFS *vfs,
                                                           const LLUUID& asset_uuid,
                                                           LLAssetType::EType type,
-                                                           void* user_data, S32 status);
+                                                           void* user_data, S32 status, LLExtStat ext_status);
        // Accessor functions
        static void updateCovenantText(const std::string& string, const LLUUID& asset_id);
diff --git a/linden/indra/newview/llfloaterreleasemsg.cpp b/linden/indra/newview/llfloaterreleasemsg.cpp
new file mode 100644
index 0000000..50df25a
--- /dev/null
+++ b/linden/indra/newview/llfloaterreleasemsg.cpp
@@ -0,0 +1,152 @@
+/** 
+ * @file llfloaterreleasemsg.cpp
+ * @brief In-world HTML dialog
+ *
+ * Copyright (c) 2005-2007, 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://secondlife.com/developers/opensource/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://secondlife.com/developers/opensource/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.
+ */
+#include "llviewerprecompiledheaders.h"
+#include "llvieweruictrlfactory.h"
+#include "llviewerwindow.h"
+#include "llviewercontrol.h"
+#include "llfloaterreleasemsg.h"
+#include "llagent.h"
+#include "llviewerregion.h"
+extern LLAgent gAgent;
+extern LLString gLastVersionChannel;
+LLFloaterReleaseMsg* LLFloaterReleaseMsg::sInstance = 0;
+////////////////////////////////////////////////////////////////////////////////
+//
+LLFloaterReleaseMsg* LLFloaterReleaseMsg::getInstance()
+{
+    if ( ! sInstance )
+        sInstance = new LLFloaterReleaseMsg;
+        return sInstance;
+}
+////////////////////////////////////////////////////////////////////////////////
+//
+LLFloaterReleaseMsg::LLFloaterReleaseMsg()
+:       LLFloater( "Release Message Floater" )
+#if LL_LIBXUL_ENABLED
+        ,
+        mWebBrowser( 0 )
+#endif // LL_LIBXUL_ENABLED
+{
+        // create floater from its XML definition
+        gUICtrlFactory->buildFloater( this, "floater_sim_release_message.xml" );
+        mTitleBase = getTitle();
+        // reposition floater from saved settings
+        LLRect rect = gSavedSettings.getRect( "HtmlReleaseMessage" );
+        reshape( rect.getWidth(), rect.getHeight(), FALSE );
+        setRect( rect );
+#if LL_LIBXUL_ENABLED
+        mWebBrowser = LLViewerUICtrlFactory::getWebBrowserByName(this,  "release_message_floater_browser" );
+        if ( mWebBrowser )
+        {
+                // observe browser events
+                mWebBrowser->addObserver( this );
+                // make links open in external browser
+                mWebBrowser->setOpenInExternalBrowser( true );
+                // don't automatically open secondlife links since we want to catch
+                // special ones that do other stuff (like open F1 Help)
+                //mWebBrowser->setOpenSecondLifeLinksInMap( false );
+        }
+#endif // LL_LIBXUL_ENABLED
+                        
+        childSetAction("close_btn", onClickClose, this);
+        setDefaultBtn("close_btn");
+}
+////////////////////////////////////////////////////////////////////////////////
+//
+LLFloaterReleaseMsg::~LLFloaterReleaseMsg()
+{
+#if LL_LIBXUL_ENABLED
+        // stop observing browser events
+        if ( mWebBrowser )
+                mWebBrowser->remObserver( this );
+#endif // LL_LIBXUL_ENABLED
+        // save position of floater
+        gSavedSettings.setRect( "HtmlReleaseMessage", mRect );
+        sInstance = 0;
+}
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLFloaterReleaseMsg::show()
+{
+        std::string url = gAgent.getRegion()->getCapability("ServerReleaseNotes");
+        if (url.empty()) return;
+        llinfos << "Release message url: " << url << llendl;
+        if (!sInstance)
+        {
+                sInstance = new LLFloaterReleaseMsg();
+                sInstance->center();
+        }
+        sInstance->setTitle(sInstance->mTitleBase + " " + gLastVersionChannel);
+        sInstance->open();
+#if LL_LIBXUL_ENABLED
+        // navigate to the URL
+        if ( sInstance->mWebBrowser )
+                sInstance->mWebBrowser->navigateTo( url );
+#endif // LL_LIBXUL_ENABLED
+        // make floater appear
+        sInstance->setVisibleAndFrontmost();
+        sInstance->draw();
+}
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLFloaterReleaseMsg::onClickClose( void* data )
+{
+        LLFloaterReleaseMsg* self = ( LLFloaterReleaseMsg* )data;
+        self->setVisible( false );
+}
diff --git a/linden/indra/newview/llfloaterreleasemsg.h b/linden/indra/newview/llfloaterreleasemsg.h
new file mode 100644
index 0000000..026b9da
--- /dev/null
+++ b/linden/indra/newview/llfloaterreleasemsg.h
@@ -0,0 +1,55 @@
+/** 
+ * @file LLFloaterReleaseMsg.h
+ *
+ * Copyright (c) 2005-2007, 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://secondlife.com/developers/opensource/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://secondlife.com/developers/opensource/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.
+ */
+#ifndef LL_LLFLOATERRELMSG_H
+#define LL_LLFLOATERRELMSG_H
+#include "llwebbrowserctrl.h"
+#include "llfloater.h"
+class LLFloaterReleaseMsg :
+        public LLFloater,
+        public LLWebBrowserCtrlObserver
+{
+        public:
+                static LLFloaterReleaseMsg* getInstance();
+                virtual ~LLFloaterReleaseMsg();
+                                
+                static void show();
+                static void onClickClose( void* data );
+                static LLFloaterReleaseMsg* sInstance;
+                LLString mTitleBase;
+        private:
+                LLFloaterReleaseMsg();
+#if LL_LIBXUL_ENABLED
+                LLWebBrowserCtrl* mWebBrowser;
+#endif // LL_LIBXUL_ENABLED
+                LLButton* mCloseButton;
+};
+#endif
diff --git a/linden/indra/newview/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp
index 7e6bf4d..f37f8a0 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.cpp
@@ -41,7 +41,7 @@
 #include "llinventory.h"
 #include "llstring.h"
 #include "llsys.h"
-#include "llversion.h"
+#include "llversionviewer.h"
 #include "message.h"
 #include "v3math.h"
@@ -930,7 +930,7 @@ void LLFloaterReporter::uploadImage()
 // static
-void LLFloaterReporter::uploadDoneCallback(const LLUUID &uuid, void *user_data, S32 result) // StoreAssetData callback (fixed)
+void LLFloaterReporter::uploadDoneCallback(const LLUUID &uuid, void *user_data, S32 result, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
        LLUploadDialog::modalUploadFinished();
diff --git a/linden/indra/newview/llfloaterreporter.h b/linden/indra/newview/llfloaterreporter.h
index 9cb8557..32fff6b 100644
--- a/linden/indra/newview/llfloaterreporter.h
+++ b/linden/indra/newview/llfloaterreporter.h
@@ -94,7 +94,7 @@ public:
        static void onClickObjPicker    (void *userdata);
        static void onClickSelectAbuser (void *userdata);
        static void closePickTool       (void *userdata);
-        static void uploadDoneCallback(const LLUUID &uuid, void* user_data, S32 result);
+        static void uploadDoneCallback(const LLUUID &uuid, void* user_data, S32 result, LLExtStat ext_status);
        static void addDescription(const LLString& description, LLMeanCollisionData *mcd = NULL);
        static void setDescription(const LLString& description, LLMeanCollisionData *mcd = NULL);
        
diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index 8b104a3..7cb92ff 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -678,15 +678,17 @@ void LLSnapshotLivePreview::saveTexture()
                LLVFile::writeFile(formatted->getData(), formatted->getDataSize(), gVFS, new_asset_id, LLAssetType::AT_TEXTURE);
                std::string pos_string;
                gAgent.buildLocationString(pos_string);
+                std::string who_took_it;
+                gAgent.buildFullname(who_took_it);
                upload_new_resource(tid,        // tid
                                                        LLAssetType::AT_TEXTURE,
-                                                        "Snapshot",
+                                                        "Snapshot : " + pos_string,
-                                                        pos_string,
+                                                        "Taken by " + who_took_it + " at " + pos_string,
                                                        0,
                                                        LLAssetType::AT_SNAPSHOT_CATEGORY,
                                                        LLInventoryType::IT_SNAPSHOT,
                                                        PERM_ALL,
-                                                        "Snapshot");
+                                                        "Snapshot : " + pos_string);
        }
        else
        {
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index df5d488..4aa817e 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -400,13 +400,18 @@ LLFloaterTools::LLFloaterTools()
        mSmallHeight = mLargeHeight;
        if (mTab) mSmallHeight -= mTab->getRect().getHeight();
        
-        gSavedSettings.setBOOL("ToolboxShowMore", TRUE); // force a toggle initially
+        // force a toggle initially. seems to be needed to correctly initialize 
-        showMore(FALSE);
+        // both "more" and "less" cases. it also seems to be important to begin
+        // with the user's preference first so that it's initial position will
+        // be correct (SL-51192) -MG
+        BOOL show_more = gSavedSettings.getBOOL("ToolboxShowMore"); // get user's preference
+        gSavedSettings.setBOOL("ToolboxShowMore", show_more); // sets up forced toggle below
+        showMore( !show_more ); // does the toggle
+        showMore(  show_more ); // reset the real user's preference
 }
 LLFloaterTools::~LLFloaterTools()
 {
-        showMore(FALSE);
        // children automatically deleted
 }
@@ -777,23 +782,20 @@ void LLFloaterTools::showMore(BOOL show_more)
        {
                reshape( mRect.getWidth(), mLargeHeight, TRUE);
                translate( 0, mSmallHeight - mLargeHeight );
-                childSetVisible("button less", true);
-                childSetVisible("button more", false);
        }
        else
        {
                reshape( mRect.getWidth(), mSmallHeight, TRUE);
                translate( 0, mLargeHeight - mSmallHeight );
-                childSetVisible("button less", false);
-                childSetVisible("button more", true);
        }
+        childSetVisible("button less",  show_more);
+        childSetVisible("button more", !show_more);
 }
 void LLFloaterTools::showPanel(EInfoPanel panel)
 {
        llassert(panel >= 0 && panel < PANEL_COUNT);
        mTab->selectTabByName(PANEL_NAMES[panel]);
-        showMore(TRUE);
 }
 void click_show_more(void *userdata)
diff --git a/linden/indra/newview/llfloatertos.cpp b/linden/indra/newview/llfloatertos.cpp
index 3ea8c49..93aa3df 100644
--- a/linden/indra/newview/llfloatertos.cpp
+++ b/linden/indra/newview/llfloatertos.cpp
@@ -267,7 +267,17 @@ void LLFloaterTOS::onContinue( void* userdata )
        {
                gAcceptCriticalMessage = TRUE;
        }
-        gStartupState++;
+        // Testing TOS dialog
+        #if ! LL_RELEASE_FOR_DOWNLOAD           
+        if ( LLStartUp::getStartupState() == STATE_LOGIN_WAIT )
+        {
+                LLStartUp::setStartupState( STATE_LOGIN_SHOW );
+        }
+        else 
+        #endif
+        LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );                    // Go back and finish authentication
        self->close(); // destroys this object
 }
@@ -277,7 +287,7 @@ void LLFloaterTOS::onCancel( void* userdata )
        LLFloaterTOS* self = (LLFloaterTOS*) userdata;
        llinfos << "User disagrees with TOS." << llendl;
        gViewerWindow->alertXml("MustAgreeToLogIn", login_alert_done);
-        gStartupState = STATE_LOGIN_SHOW;
+        LLStartUp::setStartupState( STATE_LOGIN_SHOW );
        self->mLoadCompleteCount = 0;  // reset counter for next time we come to TOS
        self->close(); // destroys this object
 }
diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index ccd252b..237563f 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -1242,6 +1242,14 @@ void LLFloaterWorldMap::onLocationCommit( void* userdata )
        LLString str = self->childGetValue("location").asString();
+        // Trim any leading and trailing spaces in the search target
+        LLString saved_str = str;
+        LLString::trim( str );
+        if ( str != saved_str )
+        {       // Set the value in the UI if any spaces were removed
+                self->childSetValue("location", str);
+        }
        LLString::toLower(str);
        gFloaterWorldMap->mCompletingRegionName = str;
        gWorldMap->mIsTrackingCommit = TRUE;
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index f3c6ace..3a58be9 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -2528,6 +2528,7 @@ LLFolderView::LLFolderView( const LLString& name, LLViewerImage* root_folder_ico
        mShowSelectionContext(FALSE),
        mShowSingleSelection(FALSE),
        mArrangeGeneration(0),
+        mUserData(NULL),
        mSelectCallback(NULL),
        mSelectionChanged(FALSE),
        mMinWidth(0),
@@ -4254,73 +4255,89 @@ LLFolderViewItem* LLFolderView::getItemByID(const LLUUID& id)
        return NULL;
 }
-//static
-void LLFolderView::idle(void* user_data)
+// Main idle routine
+void LLFolderView::doIdle()
 {
        LLFastTimer t2(LLFastTimer::FTM_INVENTORY);
-        LLFolderView* self = (LLFolderView*)user_data;
        BOOL debug_filters = gSavedSettings.getBOOL("DebugInventoryFilters");
-        if (debug_filters != self->getDebugFilters())
+        if (debug_filters != getDebugFilters())
        {
-                self->mDebugFilters = debug_filters;
+                mDebugFilters = debug_filters;
-                self->arrangeAll();
+                arrangeAll();
        }
-        self->mFilter.clearModified();
+        mFilter.clearModified();
-        BOOL filter_modified_and_active = self->mCompletedFilterGeneration < self->mFilter.getCurrentGeneration() && 
+        BOOL filter_modified_and_active = mCompletedFilterGeneration < mFilter.getCurrentGeneration() && 
-                                                                                self->mFilter.isNotDefault();
+                                                                                mFilter.isNotDefault();
-        self->mNeedsAutoSelect = filter_modified_and_active &&
+        mNeedsAutoSelect = filter_modified_and_active &&
-                                                        !(gFocusMgr.childHasKeyboardFocus(self) || gFocusMgr.getMouseCapture());
+                                                        !(gFocusMgr.childHasKeyboardFocus(this) || gFocusMgr.getMouseCapture());
        
        // filter to determine visiblity before arranging
-        self->filterFromRoot();
+        filterFromRoot();
        // automatically show matching items, and select first one
        // do this every frame until user puts keyboard focus into the inventory window
        // signaling the end of the automatic update
        // only do this when mNeedsFilter is set, meaning filtered items have
        // potentially changed
-        if (self->mNeedsAutoSelect)
+        if (mNeedsAutoSelect)
        {
                LLFastTimer t3(LLFastTimer::FTM_AUTO_SELECT);
                // select new item only if a filtered item not currently selected
-                LLFolderViewItem* selected_itemp = self->mSelectedItems.empty() ? NULL : self->mSelectedItems.back();
+                LLFolderViewItem* selected_itemp = mSelectedItems.empty() ? NULL : mSelectedItems.back();
-                if ((!selected_itemp || !selected_itemp->getFiltered()) && !self->mAutoSelectOverride)
+                if ((!selected_itemp || !selected_itemp->getFiltered()) && !mAutoSelectOverride)
                {
                        // select first filtered item
                        LLSelectFirstFilteredItem filter;
-                        self->applyFunctorRecursively(filter);
+                        applyFunctorRecursively(filter);
                }
-                self->scrollToShowSelection();
+                scrollToShowSelection();
        }
-        self->sanitizeSelection();
+        BOOL is_visible = isInVisibleChain();
-        if( self->needsArrange() && self->isInVisibleChain())
+        if ( is_visible )
        {
-                self->arrangeFromRoot();
+                sanitizeSelection();
+                if( needsArrange() )
+                {
+                        arrangeFromRoot();
+                }
        }
-        if (self->mSelectedItems.size() && self->mNeedsScroll)
+        if (mSelectedItems.size() && mNeedsScroll)
        {
-                self->scrollToShowItem(self->mSelectedItems.back());
+                scrollToShowItem(mSelectedItems.back());
                // continue scrolling until animated layout change is done
-                if (self->getCompletedFilterGeneration() >= self->mFilter.getMinRequiredGeneration() &&
+                if (getCompletedFilterGeneration() >= mFilter.getMinRequiredGeneration() &&
-                        (!self->needsArrange() || !self->isInVisibleChain()))
+                        (!needsArrange() || !is_visible))
                {
-                        self->mNeedsScroll = FALSE;
+                        mNeedsScroll = FALSE;
                }
        }
-        if (self->mSelectionChanged && self->mSelectCallback)
+        if (mSelectionChanged && mSelectCallback)
        {
                //RN: we use keyboard focus as a proxy for user-explicit actions
-                self->mSelectCallback(self->mSelectedItems, gFocusMgr.childHasKeyboardFocus(self), self->mUserData);
+                mSelectCallback(mSelectedItems, gFocusMgr.childHasKeyboardFocus(this), mUserData);
        }
-        self->mSelectionChanged = FALSE;
+        mSelectionChanged = FALSE;
 }
+//static
+void LLFolderView::idle(void* user_data)
+{
+        LLFolderView* self = (LLFolderView*)user_data;
+        if ( self )
+        {       // Do the real idle 
+                self->doIdle();
+        }
+}
 void LLFolderView::dumpSelectionInformation()
 {
        llinfos << "LLFolderView::dumpSelectionInformation()" << llendl;
diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h
index 9482b96..9336ec3 100644
--- a/linden/indra/newview/llfolderview.h
+++ b/linden/indra/newview/llfolderview.h
@@ -859,7 +859,8 @@ public:
        void removeItemID(const LLUUID& id);
        LLFolderViewItem* getItemByID(const LLUUID& id);
-        static void idle(void* user_data);
+        void    doIdle();                                               // Real idle routine
+        static void idle(void* user_data);              // static glue to doIdle()
        BOOL needsAutoSelect() { return mNeedsAutoSelect && !mAutoSelectOverride; }
        BOOL needsAutoRename() { return mNeedsAutoRename; }
diff --git a/linden/indra/newview/llgesturemgr.cpp b/linden/indra/newview/llgesturemgr.cpp
index bf3c057..9b8f2c8 100644
--- a/linden/indra/newview/llgesturemgr.cpp
+++ b/linden/indra/newview/llgesturemgr.cpp
@@ -897,7 +897,7 @@ void LLGestureManager::runStep(LLMultiGesture* gesture, LLGestureStep* step)
 void LLGestureManager::onLoadComplete(LLVFS *vfs,
                                                                           const LLUUID& asset_uuid,
                                                                           LLAssetType::EType type,
-                                                                           void* user_data, S32 status)
+                                                                           void* user_data, S32 status, LLExtStat ext_status)
 {
        LLLoadInfo* info = (LLLoadInfo*)user_data;
diff --git a/linden/indra/newview/llgesturemgr.h b/linden/indra/newview/llgesturemgr.h
index 29aecf3..92b484a 100644
--- a/linden/indra/newview/llgesturemgr.h
+++ b/linden/indra/newview/llgesturemgr.h
@@ -132,7 +132,7 @@ protected:
        static void onLoadComplete(LLVFS *vfs,
                                                   const LLUUID& asset_uuid,
                                                   LLAssetType::EType type,
-                                                   void* user_data, S32 status);
+                                                   void* user_data, S32 status, LLExtStat ext_status);
 public:
        BOOL mValid;
diff --git a/linden/indra/newview/llglslshader.cpp b/linden/indra/newview/llglslshader.cpp
index cc440c4..0a7ec4a 100644
--- a/linden/indra/newview/llglslshader.cpp
+++ b/linden/indra/newview/llglslshader.cpp
@@ -29,6 +29,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "llviewerwindow.h"
+#include "llfeaturemanager.h"
 #include "llglslshader.h"
 #include "llviewercontrol.h"
 #include "pipeline.h"
@@ -412,7 +413,7 @@ void LLShaderMgr::setShaders()
        
        if (gGLManager.mHasFramebufferObject)
        {
-                LLPipeline::sDynamicReflections = gSavedSettings.getBOOL("RenderDynamicReflections");
+                LLPipeline::sDynamicReflections = gSavedSettings.getBOOL("RenderDynamicReflections") && gGLManager.mHasCubeMap && gFeatureManagerp->isFeatureAvailable("RenderCubeMap");
                LLPipeline::sRenderGlow = gSavedSettings.getBOOL("RenderGlow");
        }
        else
@@ -471,7 +472,7 @@ void LLShaderMgr::setShaders()
                        loadShadersAvatar();
                        // Load shaders to correct levels
-                        if (!gSavedSettings.getBOOL("RenderRippleWater"))
+                        if (!(gSavedSettings.getBOOL("RenderRippleWater") && gGLManager.mHasCubeMap && gFeatureManagerp->isFeatureAvailable("RenderCubeMap")))
                        {
                                if (gSavedSettings.getBOOL("RenderGlow"))
                                {
diff --git a/linden/indra/newview/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp
index aa84e3d..95d4dbf 100644
--- a/linden/indra/newview/llgroupnotify.cpp
+++ b/linden/indra/newview/llgroupnotify.cpp
@@ -226,7 +226,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
        text->setCursor(0,0);
        text->setEnabled(FALSE);
        text->setWordWrap(TRUE);
-        text->setTakesFocus(FALSE);
+        text->setTakesFocus(TRUE);                      // Allow focus so text can be copied.  Since it's not enabled, it will be read-only
        text->setTabToNextField(TRUE);
        text->setMouseOpaque(TRUE);
        text->setBorderVisible(TRUE);
diff --git a/linden/indra/newview/llhudeffectlookat.cpp b/linden/indra/newview/llhudeffectlookat.cpp
index da0ec60..6922f29 100644
--- a/linden/indra/newview/llhudeffectlookat.cpp
+++ b/linden/indra/newview/llhudeffectlookat.cpp
@@ -39,6 +39,10 @@
 #include "llselectmgr.h"
 #include "llglheaders.h"
+#include "llxmltree.h"
 BOOL LLHUDEffectLookAt::sDebugLookAt = FALSE;
 // packet layout
@@ -54,69 +58,179 @@ const F32 MAX_SENDS_PER_SEC = 4.f;
 const F32 MIN_DELTAPOS_FOR_UPDATE = 0.05f;
 const F32 MIN_TARGET_OFFSET_SQUARED = 0.0001f;
-// timeouts
 // can't use actual F32_MAX, because we add this to the current frametime
 const F32 MAX_TIMEOUT = F32_MAX / 2.f;
-const F32 LOOKAT_TIMEOUTS[LOOKAT_NUM_TARGETS] = 
+/**
+ * Simple data class holding values for a particular type of attention.
+ */
+class LLAttention
 {
-        MAX_TIMEOUT, //LOOKAT_TARGET_NONE
+public:
-        3.f, //LOOKAT_TARGET_IDLE
+        LLAttention(){}
-        4.f, //LOOKAT_TARGET_AUTO_LISTEN
+        LLAttention(F32 timeout, F32 priority, char *name, LLColor3 color) :
-        2.f, //LOOKAT_TARGET_FREELOOK
+          mTimeout(timeout), mPriority(priority), mName(name), mColor(color)
-        4.f, //LOOKAT_TARGET_RESPOND
+        {
-        1.f, //LOOKAT_TARGET_HOVER
+        }
-        MAX_TIMEOUT, //LOOKAT_TARGET_CONVERSATION
+        F32 mTimeout, mPriority;
-        MAX_TIMEOUT, //LOOKAT_TARGET_SELECT
+        LLString mName;
-        MAX_TIMEOUT, //LOOKAT_TARGET_FOCUS
+        LLColor3 mColor;
-        MAX_TIMEOUT, //LOOKAT_TARGET_MOUSELOOK
-        0.f, //LOOKAT_TARGET_CLEAR
 };
-const S32 LOOKAT_PRIORITIES[LOOKAT_NUM_TARGETS] = 
+/**
+ * Simple data class holding a list of attentions, one for every type.
+ */
+class LLAttentionSet
 {
-        0, //LOOKAT_TARGET_NONE
+public:
-        1, //LOOKAT_TARGET_IDLE
+        LLAttentionSet(const LLAttention attentions[])
-        3, //LOOKAT_TARGET_AUTO_LISTEN
+        {
-        2, //LOOKAT_TARGET_FREELOOK
+                for(int i=0; i<LOOKAT_NUM_TARGETS; i++)
-        3, //LOOKAT_TARGET_RESPOND
+                {
-        4, //LOOKAT_TARGET_HOVER
+                        mAttentions[i] = attentions[i];
-        5, //LOOKAT_TARGET_CONVERSATION
+                }
-        6, //LOOKAT_TARGET_SELECT
+        }
-        6, //LOOKAT_TARGET_FOCUS
+        LLAttention mAttentions[LOOKAT_NUM_TARGETS];
-        7, //LOOKAT_TARGET_MOUSELOOK
+        LLAttention& operator[](int idx) { return mAttentions[idx]; }
-        8, //LOOKAT_TARGET_CLEAR
 };
-const char *LOOKAT_STRINGS[] = 
+// Default attribute set data.
+// Used to initialize the global attribute set objects, one of which will be
+// refered to by the hud object at any given time.
+// Note that the values below are only the default values and that any or all of them
+// can be overwritten with customizing data from the XML file. The actual values below
+// are those that will give exactly the same look-at behavior as before the ability
+// to customize was added. - MG
+static const 
+        LLAttention 
+                BOY_ATTS[] = { // default set of masculine attentions
+                        LLAttention(MAX_TIMEOUT, 0, "None",                      LLColor3(0.3f, 0.3f, 0.3f)), // LOOKAT_TARGET_NONE
+                        LLAttention(3.f,         1, "Idle",                  LLColor3(0.5f, 0.5f, 0.5f)), // LOOKAT_TARGET_IDLE
+                        LLAttention(4.f,         3, "AutoListen",        LLColor3(0.5f, 0.5f, 0.5f)), // LOOKAT_TARGET_AUTO_LISTEN
+                        LLAttention(2.f,         2, "FreeLook",          LLColor3(0.5f, 0.5f, 0.9f)), // LOOKAT_TARGET_FREELOOK
+                        LLAttention(4.f,         3, "Respond",       LLColor3(0.0f, 0.0f, 0.0f)), // LOOKAT_TARGET_RESPOND
+                        LLAttention(1.f,         4, "Hover",             LLColor3(0.5f, 0.9f, 0.5f)), // LOOKAT_TARGET_HOVER
+                        LLAttention(MAX_TIMEOUT, 0, "Conversation",  LLColor3(0.1f, 0.1f, 0.5f)), // LOOKAT_TARGET_CONVERSATION
+                        LLAttention(MAX_TIMEOUT, 6, "Select",            LLColor3(0.9f, 0.5f, 0.5f)), // LOOKAT_TARGET_SELECT
+                        LLAttention(MAX_TIMEOUT, 6, "Focus",             LLColor3(0.9f, 0.5f, 0.9f)), // LOOKAT_TARGET_FOCUS
+                        LLAttention(MAX_TIMEOUT, 7, "Mouselook",         LLColor3(0.9f, 0.9f, 0.5f)), // LOOKAT_TARGET_MOUSELOOK
+                        LLAttention(0.f,         8, "Clear",             LLColor3(1.0f, 1.0f, 1.0f)), // LOOKAT_TARGET_CLEAR
+                },                                                                                                                                                              
+                GIRL_ATTS[] = { // default set of feminine attentions                                                                                                   
+                        LLAttention(MAX_TIMEOUT, 0, "None",                      LLColor3(0.3f, 0.3f, 0.3f)), // LOOKAT_TARGET_NONE
+                        LLAttention(3.f,         1, "Idle",                  LLColor3(0.5f, 0.5f, 0.5f)), // LOOKAT_TARGET_IDLE
+                        LLAttention(4.f,         3, "AutoListen",        LLColor3(0.5f, 0.5f, 0.5f)), // LOOKAT_TARGET_AUTO_LISTEN
+                        LLAttention(2.f,         2, "FreeLook",          LLColor3(0.5f, 0.5f, 0.9f)), // LOOKAT_TARGET_FREELOOK
+                        LLAttention(4.f,         3, "Respond",       LLColor3(0.0f, 0.0f, 0.0f)), // LOOKAT_TARGET_RESPOND
+                        LLAttention(1.f,         4, "Hover",             LLColor3(0.5f, 0.9f, 0.5f)), // LOOKAT_TARGET_HOVER
+                        LLAttention(MAX_TIMEOUT, 0, "Conversation",  LLColor3(0.1f, 0.1f, 0.5f)), // LOOKAT_TARGET_CONVERSATION
+                        LLAttention(MAX_TIMEOUT, 6, "Select",            LLColor3(0.9f, 0.5f, 0.5f)), // LOOKAT_TARGET_SELECT
+                        LLAttention(MAX_TIMEOUT, 6, "Focus",             LLColor3(0.9f, 0.5f, 0.9f)), // LOOKAT_TARGET_FOCUS
+                        LLAttention(MAX_TIMEOUT, 7, "Mouselook",         LLColor3(0.9f, 0.9f, 0.5f)), // LOOKAT_TARGET_MOUSELOOK
+                        LLAttention(0.f,         8, "Clear",             LLColor3(1.0f, 1.0f, 1.0f)), // LOOKAT_TARGET_CLEAR
+                };
+static LLAttentionSet
+        gBoyAttentions(BOY_ATTS),
+        gGirlAttentions(GIRL_ATTS);
+static BOOL loadGender(LLXmlTreeNode* gender)
 {
-        "None",                 //LOOKAT_TARGET_NONE
+        if( !gender)
-        "Idle",                 //LOOKAT_TARGET_IDLE
+        {
-        "AutoListen",   //LOOKAT_TARGET_AUTO_LISTEN
+                return FALSE;
-        "FreeLook",             //LOOKAT_TARGET_FREELOOK
+        }
-        "Respond",              //LOOKAT_TARGET_RESPOND
+        LLString str;
-        "Hover",                //LOOKAT_TARGET_HOVER
+        gender->getAttributeString("name", str);
-        "Conversation", //LOOKAT_TARGET_CONVERSATION
+        LLAttentionSet& attentions = (str.compare("Masculine") == 0) ? gBoyAttentions : gGirlAttentions;
-        "Select",               //LOOKAT_TARGET_SELECT
+        for (LLXmlTreeNode* attention_node = gender->getChildByName( "param" );
-        "Focus",                //LOOKAT_TARGET_FOCUS
+                 attention_node;
-        "Mouselook",    //LOOKAT_TARGET_MOUSELOOK
+                 attention_node = gender->getNextNamedChild())
-        "Clear",                //LOOKAT_TARGET_CLEAR
+        {
-};
+                attention_node->getAttributeString("attention", str);
+                LLAttention* attention;
+                if     (str == "idle")         attention = &attentions[LOOKAT_TARGET_IDLE];
+                else if(str == "auto_listen")  attention = &attentions[LOOKAT_TARGET_AUTO_LISTEN];
+                else if(str == "freelook")     attention = &attentions[LOOKAT_TARGET_FREELOOK];
+                else if(str == "respond")      attention = &attentions[LOOKAT_TARGET_RESPOND];
+                else if(str == "hover")        attention = &attentions[LOOKAT_TARGET_HOVER];
+                else if(str == "conversation") attention = &attentions[LOOKAT_TARGET_CONVERSATION];
+                else if(str == "select")       attention = &attentions[LOOKAT_TARGET_SELECT];
+                else if(str == "focus")        attention = &attentions[LOOKAT_TARGET_FOCUS];
+                else if(str == "mouselook")    attention = &attentions[LOOKAT_TARGET_MOUSELOOK];
+                else return FALSE;
+                F32 priority, timeout;
+                attention_node->getAttributeF32("priority", priority);
+                attention_node->getAttributeF32("timeout", timeout);
+                if(timeout < 0) timeout = MAX_TIMEOUT;
+                attention->mPriority = priority;
+                attention->mTimeout = timeout;
+        }       
+        return TRUE;
+}
-const LLColor3 LOOKAT_COLORS[LOOKAT_NUM_TARGETS] =
+static BOOL loadAttentions()
 {
-        LLColor3(0.3f, 0.3f, 0.3f), //LOOKAT_TARGET_NONE
+        static BOOL first_time = TRUE;
-        LLColor3(0.5f, 0.5f, 0.5f), //LOOKAT_TARGET_IDLE
+        if( ! first_time) 
-        LLColor3(0.5f, 0.5f, 0.5f), //LOOKAT_TARGET_AUTO_LISTEN
+        {
-        LLColor3(0.5f, 0.5f, 0.9f), //LOOKAT_TARGET_FREELOOK
+                return TRUE; // maybe not ideal but otherwise it can continue to fail forever.
-        LLColor3(0.f, 0.f, 0.f),        //LOOKAT_TARGET_RESPOND
+        }
-        LLColor3(0.5f, 0.9f, 0.5f), //LOOKAT_TARGET_HOVER
+        first_time = FALSE;
-        LLColor3(0.1f, 0.1f, 0.5f),     //LOOKAT_TARGET_CONVERSATION
+        
-        LLColor3(0.9f, 0.5f, 0.5f), //LOOKAT_TARGET_SELECT
+        char filename[MAX_PATH]; /*Flawfinder: ignore*/
-        LLColor3(0.9f, 0.5f, 0.9f), //LOOKAT_TARGET_FOCUS
+        strncpy(filename,gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,"attentions.xml").c_str(), sizeof(filename) -1);              /*Flawfinder: ignore*/  
-        LLColor3(0.9f, 0.9f, 0.5f), //LOOKAT_TARGET_MOUSELOOK
+        filename[sizeof(filename) -1] = '\0';
-        LLColor3(1.f, 1.f, 1.f),        //LOOKAT_TARGET_CLEAR
+        LLXmlTree xml_tree;
-};
+        BOOL success = xml_tree.parseFile( filename, FALSE );
+        if( !success )
+        {
+                return FALSE;
+        }
+        LLXmlTreeNode* root = xml_tree.getRoot();
+        if( !root )
+        {
+                return FALSE;
+        }
+        //-------------------------------------------------------------------------
+        // <linden_attentions version="1.0"> (root)
+        //-------------------------------------------------------------------------
+        if( !root->hasName( "linden_attentions" ) )
+        {
+                llwarns << "Invalid linden_attentions file header: " << filename << llendl;
+                return FALSE;
+        }
+        LLString version;
+        static LLStdStringHandle version_string = LLXmlTree::addAttributeString("version");
+        if( !root->getFastAttributeString( version_string, version ) || (version != "1.0") )
+        {
+                llwarns << "Invalid linden_attentions file version: " << version << llendl;
+                return FALSE;
+        }
+        //-------------------------------------------------------------------------
+        // <gender>
+        //-------------------------------------------------------------------------
+        for (LLXmlTreeNode* child = root->getChildByName( "gender" );
+                 child;
+                 child = root->getNextNamedChild())
+        {
+                if( !loadGender( child ) )
+                {
+                        return FALSE;
+                }
+        }
+        return TRUE;
+}
 //-----------------------------------------------------------------------------
 // LLHUDEffectLookAt()
@@ -127,6 +241,10 @@ LLHUDEffectLookAt::LLHUDEffectLookAt(const U8 type) :
        mLastSendTime(0.f)
 {
        clearLookAtTarget();
+        // parse the default sets
+        loadAttentions();
+        // initialize current attention set. switches when avatar sex changes.
+        mAttentions = &gGirlAttentions;
 }
 //-----------------------------------------------------------------------------
@@ -280,7 +398,7 @@ BOOL LLHUDEffectLookAt::setLookAt(ELookAtType target_type, LLViewerObject *objec
        llassert(target_type < LOOKAT_NUM_TARGETS);
        // must be same or higher priority than existing effect
-        if (LOOKAT_PRIORITIES[target_type] < LOOKAT_PRIORITIES[mTargetType])
+        if ((*mAttentions)[target_type].mPriority < (*mAttentions)[mTargetType].mPriority)
        {
                return FALSE;
        }
@@ -288,8 +406,7 @@ BOOL LLHUDEffectLookAt::setLookAt(ELookAtType target_type, LLViewerObject *objec
        F32 current_time  = mTimer.getElapsedTimeF32();
        // type of lookat behavior or target object has changed
-        BOOL lookAtChanged = (target_type != mTargetType) ||
+        BOOL lookAtChanged = (target_type != mTargetType) || (object != mTargetObject);
-                (object != mTargetObject);
        // lookat position has moved a certain amount and we haven't just sent an update
        lookAtChanged = lookAtChanged || (dist_vec(position, mLastSentOffsetGlobal) > MIN_DELTAPOS_FOR_UPDATE) && 
@@ -298,7 +415,8 @@ BOOL LLHUDEffectLookAt::setLookAt(ELookAtType target_type, LLViewerObject *objec
        if (lookAtChanged)
        {
                mLastSentOffsetGlobal = position;
-                setDuration(LOOKAT_TIMEOUTS[target_type]);
+                F32 timeout = (*mAttentions)[target_type].mTimeout;
+                setDuration(timeout);
                setNeedsSendToSim(TRUE);
        }
 
@@ -379,7 +497,7 @@ void LLHUDEffectLookAt::render()
                glScalef(0.3f, 0.3f, 0.3f);
                glBegin(GL_LINES);
                {
-                        LLColor3 color = LOOKAT_COLORS[mTargetType];
+                        LLColor3 color = (*mAttentions)[mTargetType].mColor;
                        glColor3f(color.mV[VRED], color.mV[VGREEN], color.mV[VBLUE]);
                        glVertex3f(-1.f, 0.f, 0.f);
                        glVertex3f(1.f, 0.f, 0.f);
@@ -412,6 +530,13 @@ void LLHUDEffectLookAt::update()
                return;
        }
+        // make sure the proper set of avatar attention are currently being used.
+        LLVOAvatar* source_avatar = (LLVOAvatar*)(LLViewerObject*)mSourceObject;
+        // for now the first cut will just switch on sex. future development could adjust 
+        // timeouts according to avatar age and/or other features. 
+        mAttentions = (source_avatar->getSex() == SEX_MALE) ? &gBoyAttentions : &gGirlAttentions;
+        //printf("updated to %s\n", (source_avatar->getSex() == SEX_MALE) ? "male" : "female");
        F32 time = mTimer.getElapsedTimeF32();
        // clear out the effect if time is up
@@ -438,7 +563,7 @@ void LLHUDEffectLookAt::update()
        if (sDebugLookAt)
        {
-                ((LLVOAvatar*)(LLViewerObject*)mSourceObject)->addDebugText(LOOKAT_STRINGS[mTargetType]);
+                ((LLVOAvatar*)(LLViewerObject*)mSourceObject)->addDebugText((*mAttentions)[mTargetType].mName);
        }
 }
diff --git a/linden/indra/newview/llhudeffectlookat.h b/linden/indra/newview/llhudeffectlookat.h
index 8fa1ac2..fdb3432 100644
--- a/linden/indra/newview/llhudeffectlookat.h
+++ b/linden/indra/newview/llhudeffectlookat.h
@@ -34,6 +34,7 @@
 class LLViewerObject;
 class LLVOAvatar;
+class LLAttentionSet;
 typedef enum e_lookat_type
 {
@@ -43,7 +44,7 @@ typedef enum e_lookat_type
        LOOKAT_TARGET_FREELOOK,
        LOOKAT_TARGET_RESPOND,
        LOOKAT_TARGET_HOVER,
-        LOOKAT_TARGET_CONVERSATION,     // conversation mode deprecated
+        LOOKAT_TARGET_CONVERSATION,
        LOOKAT_TARGET_SELECT,
        LOOKAT_TARGET_FOCUS,
        LOOKAT_TARGET_MOUSELOOK,
@@ -91,6 +92,7 @@ private:
        LLFrameTimer                            mTimer;
        LLVector3                                       mTargetPos;
        F32                                                     mLastSendTime;
+        LLAttentionSet*                         mAttentions;
 };
 #endif // LL_LLHUDEFFECTLOOKAT_H
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index fd7d98e..f8baf46 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -88,10 +88,14 @@
 void inc_busy_count()
 {
 //      gViewerWindow->getWindow()->incBusyCount();
+//  check balance of these calls if this code is changed to ever actually
+//  *do* something!
 }
 void dec_busy_count()
 {
 //      gViewerWindow->getWindow()->decBusyCount();
+//  check balance of these calls if this code is changed to ever actually
+//  *do* something!
 }
 // Function declarations
@@ -906,7 +910,7 @@ BOOL LLItemBridge::removeItem()
                return FALSE;
        }
        // move it to the trash
-        LLPreview::hide(mUUID);
+        LLPreview::hide(mUUID, TRUE);
        LLInventoryModel* model = mInventoryPanel->getModel();
        if(!model) return FALSE;
        LLUUID trash_id = model->findCategoryUUIDForType(LLAssetType::AT_TRASH);
@@ -1365,6 +1369,17 @@ protected:
 void LLRightClickInventoryFetchDescendentsObserver::done()
 {
+        // Avoid passing a NULL-ref as mCompleteFolders.front() down to
+        // gInventory.collectDescendents()
+        if( mCompleteFolders.empty() )
+        {
+                llwarns << "LLRightClickInventoryFetchDescendentsObserver::done with empty mCompleteFolders" << llendl;
+                dec_busy_count();
+                gInventory.removeObserver(this);
+                delete this;
+                return;
+        }
        // What we do here is get the complete information on the items in
        // the library, and set up an observer that will wait for that to
        // happen.
@@ -1375,7 +1390,7 @@ void LLRightClickInventoryFetchDescendentsObserver::done()
                                                                  item_array,
                                                                  LLInventoryModel::EXCLUDE_TRASH);
        S32 count = item_array.count();
-#if 0
+#if 0 // HACK/TODO: Why?
        // This early causes a giant menu to get produced, and doesn't seem to be needed.
        if(!count)
        {
@@ -2919,7 +2934,6 @@ void LLGestureBridge::openItem()
 BOOL LLGestureBridge::removeItem()
 {
        // Force close the preview window, if it exists
-        LLPreview::hide(mUUID);
        gGestureManager.deactivateGesture(mUUID);
        return LLItemBridge::removeItem();
 }
@@ -3458,13 +3472,27 @@ public:
        {
                /*
                 * Do nothing.  We only care about the destructor
+                 *
+                 * The reason for this is that this callback is used in a hack where the
+                 * same callback is given to dozens of items, and the destructor is called
+                 * after the last item has fired the event and dereferenced it -- if all
+                 * the events actually fire!
                 */
        }
 protected:
        ~LLWearInventoryCategoryCallback()
        {
-                wear_inventory_category_on_avatar(gInventory.getCategory(mCatID), mAppend);
+                // Is the destructor called by ordinary dereference, or because the app's shutting down?
+                // If the inventory callback manager goes away, we're shutting down, no longer want the callback.
+                if( LLInventoryCallbackManager::is_instantiated() )
+                {
+                        wear_inventory_category_on_avatar(gInventory.getCategory(mCatID), mAppend);
+                }
+                else
+                {
+                        llwarns << "Dropping unhandled LLWearInventoryCategoryCallback" << llendl;
+                }
        }
 private:
@@ -4214,8 +4242,17 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                items.push_back("Restore Item");
        }
        else
-        {
+        {       // FWIW, it looks like SUPPRESS_OPEN_ITEM is not set anywhere
                BOOL no_open = ((flags & SUPPRESS_OPEN_ITEM) == SUPPRESS_OPEN_ITEM);
+                // If we have clothing, don't add "Open" as it's the same action as "Wear"   SL-18976
+                LLViewerInventoryItem* item = getItem();
+                if( !no_open && item )
+                {
+                        no_open = (item->getType() == LLAssetType::AT_CLOTHING) ||
+                                          (item->getType() == LLAssetType::AT_BODYPART);
+                }
                if (!no_open)
                {
                        items.push_back("Open");
@@ -4242,7 +4279,6 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                                                                                 LLWearableBridge::canEditOnAvatar,
                                                                                 (void*)this));*/
-                LLViewerInventoryItem* item = getItem();
                if( item && (item->getType() == LLAssetType::AT_CLOTHING) )
                {
                        items.push_back("Take Off");
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index 112c071..8b7809d 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -1367,12 +1367,12 @@ void LLInventoryPanel::modelChanged(U32 mask)
                        if(view)
                        {
                                // request refresh on this item (also flags for filtering)
-                                view->refresh();
                                bridge = (LLInvFVBridge*)view->getListener();
                                if(bridge)
-                                {
+                                {       // Clear the display name first, so it gets properly re-built during refresh()
                                        bridge->clearDisplayName();
                                }
+                                view->refresh();
                        }
                }
        }
diff --git a/linden/indra/newview/lllandmarklist.cpp b/linden/indra/newview/lllandmarklist.cpp
index a0ad1ce..7633be4 100644
--- a/linden/indra/newview/lllandmarklist.cpp
+++ b/linden/indra/newview/lllandmarklist.cpp
@@ -77,7 +77,8 @@ void LLLandmarkList::processGetAssetReply(
        const LLUUID& uuid,
        LLAssetType::EType type,
        void* user_data,
-        S32 status)
+        S32 status, 
+        LLExtStat ext_status )
 {
        if( status == 0 )
        {
diff --git a/linden/indra/newview/lllandmarklist.h b/linden/indra/newview/lllandmarklist.h
index 50ccfb6..1d69158 100644
--- a/linden/indra/newview/lllandmarklist.h
+++ b/linden/indra/newview/lllandmarklist.h
@@ -55,7 +55,8 @@ public:
                const LLUUID& uuid,
                LLAssetType::EType type,
                void* user_data,
-                S32 status);
+                S32 status,
+                LLExtStat ext_status );
 protected:
        typedef std::map<LLUUID, LLLandmark*> landmark_list_t;
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp
index a7312fc..e405dc4 100644
--- a/linden/indra/newview/llmaniptranslate.cpp
+++ b/linden/indra/newview/llmaniptranslate.cpp
@@ -349,7 +349,7 @@ BOOL LLManipTranslate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
        if (!selected_object)
        {
                // somehow we lost the object!
-                llwarns << "Translate manip lost the object" << llendl;
+                llwarns << "Translate manip lost the object, no selected object" << llendl;
                gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
                return TRUE;
        }
@@ -367,9 +367,12 @@ BOOL LLManipTranslate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
        if (mManipPart >= LL_YZ_PLANE && mManipPart <= LL_XY_PLANE)
        {
                LLCoordGL mouse_pos;
-                gCamera->projectPosAgentToScreen(select_center_agent, mouse_pos);
+                if (!gCamera->projectPosAgentToScreen(select_center_agent, mouse_pos))
+                {
-                if (gSavedSettings.getBOOL("SnapToMouseCursor"))
+                        // mouse_pos may be nonsense
+                        llwarns << "Failed to project object center to screen" << llendl;
+                }
+                else if (gSavedSettings.getBOOL("SnapToMouseCursor"))
                {
                        LLUI::setCursorPositionScreen(mouse_pos.mX, mouse_pos.mY);
                        x = mouse_pos.mX;
@@ -480,7 +483,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
        if (!selectNode)
        {
                // somehow we lost the object!
-                llwarns << "Translate manip lost the object" << llendl;
+                llwarns << "Translate manip lost the object, no selectNode" << llendl;
                gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
                return TRUE;
        }
@@ -489,7 +492,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
        if (!object)
        {
                // somehow we lost the object!
-                llwarns << "Translate manip lost the object" << llendl;
+                llwarns << "Translate manip lost the object, no object in selectNode" << llendl;
                gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
                return TRUE;
        }
diff --git a/linden/indra/newview/llmutelist.cpp b/linden/indra/newview/llmutelist.cpp
index b5764c5..024123e 100644
--- a/linden/indra/newview/llmutelist.cpp
+++ b/linden/indra/newview/llmutelist.cpp
@@ -192,7 +192,7 @@ BOOL LLMuteList::isLinden(const LLString& name) const
 BOOL LLMuteList::add(const LLMute& mute, U32 flags)
 {
        // Can't mute text from Lindens
-        if ((mute.mType == LLMute::AGENT || mute.mType == LLMute::BY_NAME)
+        if ((mute.mType == LLMute::AGENT)
                && isLinden(mute.mName) && (flags & LLMute::flagTextChat || flags == 0))
        {
                gViewerWindow->alertXml("MuteLinden");
@@ -613,7 +613,7 @@ void LLMuteList::processUseCachedMuteList(LLMessageSystem* msg, void**)
        gMuteListp->loadFromFile(filename);
 }
-void LLMuteList::onFileMuteList(void** user_data, S32 error_code)
+void LLMuteList::onFileMuteList(void** user_data, S32 error_code, LLExtStat ext_status)
 {
        llinfos << "LLMuteList::processMuteListFile()" << llendl;
        if (!gMuteListp) return;
diff --git a/linden/indra/newview/llmutelist.h b/linden/indra/newview/llmutelist.h
index 4624bfd..63bee60 100644
--- a/linden/indra/newview/llmutelist.h
+++ b/linden/indra/newview/llmutelist.h
@@ -123,7 +123,7 @@ private:
        static void processMuteListUpdate(LLMessageSystem* msg, void**);
        static void processUseCachedMuteList(LLMessageSystem* msg, void**);
-        static void onFileMuteList(void** user_data, S32 code);
+        static void onFileMuteList(void** user_data, S32 code, LLExtStat ext_status);
 private:
        struct compare_by_name
diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp
index 4f5c64b..7c206bb 100644
--- a/linden/indra/newview/llnotify.cpp
+++ b/linden/indra/newview/llnotify.cpp
@@ -552,12 +552,13 @@ void LLNotifyBox::close()
 }
 /*virtual*/
-void LLNotifyBox::tick()
+BOOL LLNotifyBox::tick()
 {
        if (mIsTip)
        {
                close();
        }
+        return FALSE;
 }
 void LLNotifyBox::setVisible(BOOL visible)
diff --git a/linden/indra/newview/llnotify.h b/linden/indra/newview/llnotify.h
index ad9b24a..b08634d 100644
--- a/linden/indra/newview/llnotify.h
+++ b/linden/indra/newview/llnotify.h
@@ -86,7 +86,7 @@ protected:
        // Animate as sliding onto the screen.
        /*virtual*/ void draw();
-        /*virtual*/ void tick();
+        /*virtual*/ BOOL tick();
        void moveToBack();
diff --git a/linden/indra/newview/llpanelclassified.cpp b/linden/indra/newview/llpanelclassified.cpp
index f7ef441..5f7bb6e 100644
--- a/linden/indra/newview/llpanelclassified.cpp
+++ b/linden/indra/newview/llpanelclassified.cpp
@@ -269,7 +269,7 @@ void LLPanelClassified::apply()
 {
        // Apply is used for automatically saving results, so only
        // do that if there is a difference, and this is a save not create.
-        if (mDirty && mPaidFor)
+        if (checkDirty() && mPaidFor)
        {
                sendClassifiedInfoUpdate();
        }
@@ -313,7 +313,8 @@ void LLPanelClassified::saveCallback(S32 option, void* data)
 BOOL LLPanelClassified::canClose()
 {
-        if (mForceClose || !mDirty) return TRUE;
+        if (mForceClose || !checkDirty()) 
+                return TRUE;
        LLString::format_map_t args;
        args["[NAME]"] = mNameEditor->getText();
@@ -676,7 +677,7 @@ void LLPanelClassified::refresh()
                mSetBtn->setVisible(is_self);
                mSetBtn->setEnabled(is_self);
-                mUpdateBtn->setEnabled(is_self && mDirty);
+                mUpdateBtn->setEnabled(is_self && checkDirty());
                mUpdateBtn->setVisible(is_self);
        }
 }
@@ -736,29 +737,44 @@ void LLPanelClassified::callbackGotPriceForListing(S32 option, LLString text, vo
 }
-// static
-void LLPanelClassified::callbackConfirmPublish(S32 option, void* data)
-{
-        LLPanelClassified* self = (LLPanelClassified*)data;
+// invoked from callbackConfirmPublish
+void LLPanelClassified::confirmPublish(S32 option)
+{
        // Option 0 = publish
        if (option != 0) return;
-        self->sendClassifiedInfoUpdate();
+        sendClassifiedInfoUpdate();
        // Big hack - assume that top picks are always in a browser,
        // and non-finder-classifieds are always in a tab container.
-        if (self->mInFinder)
+        if (mInFinder)
        {
                // TODO: enable this
-                //LLPanelDirClassifieds* panel = (LLPanelDirClassifieds*)self->getParent();
+                //LLPanelDirClassifieds* panel = (LLPanelDirClassifieds*)getParent();
-                //panel->renameClassified(self->mClassifiedID, self->mNameEditor->getText().c_str());
+                //panel->renameClassified(mClassifiedID, mNameEditor->getText().c_str());
        }
        else
        {
-                LLTabContainerVertical* tab = (LLTabContainerVertical*)self->getParent();
+                LLTabContainerVertical* tab = (LLTabContainerVertical*)getParent();
-                tab->setCurrentTabName(self->mNameEditor->getText());
+                tab->setCurrentTabName(mNameEditor->getText());
        }
+        // Tell all the widgets to reset their dirty state since the ad was just saved
+        mSnapshotCtrl->resetDirty();
+        mNameEditor->resetDirty();
+        mDescEditor->resetDirty();
+        mLocationEditor->resetDirty();
+        mCategoryCombo->resetDirty();
+        mMatureCheck->resetDirty();
+        mAutoRenewCheck->resetDirty();
+}
+// static
+void LLPanelClassified::callbackConfirmPublish(S32 option, void* data)
+{
+        LLPanelClassified* self = (LLPanelClassified*)data;
+        self->confirmPublish(option);
 }
 // static
@@ -831,13 +847,27 @@ void LLPanelClassified::onClickSet(void* data)
 }
+BOOL LLPanelClassified::checkDirty()
+{
+        mDirty = FALSE;
+        if      ( mSnapshotCtrl )                       mDirty |= mSnapshotCtrl->isDirty();
+        if      ( mNameEditor )                         mDirty |= mNameEditor->isDirty();
+        if      ( mDescEditor )                         mDirty |= mDescEditor->isDirty();
+        if      ( mLocationEditor )                     mDirty |= mLocationEditor->isDirty();
+        if      ( mCategoryCombo )                      mDirty |= mCategoryCombo->isDirty();
+        if      ( mMatureCheck )                        mDirty |= mMatureCheck->isDirty();
+        if      ( mAutoRenewCheck )                     mDirty |= mAutoRenewCheck->isDirty();
+        return mDirty;
+}
 // static
 void LLPanelClassified::onCommitAny(LLUICtrl* ctrl, void* data)
 {
        LLPanelClassified* self = (LLPanelClassified*)data;
        if (self)
        {
-                self->mDirty = true;
+                self->checkDirty();
        }
 }
@@ -845,7 +875,6 @@ void LLPanelClassified::onCommitAny(LLUICtrl* ctrl, void* data)
 void LLPanelClassified::onFocusReceived(LLUICtrl* ctrl, void* data)
 {
        // allow the data to be saved
-        // Dave/Simon TODO: replace this with better isDirty() functionality
        onCommitAny(ctrl, data);
 }
diff --git a/linden/indra/newview/llpanelclassified.h b/linden/indra/newview/llpanelclassified.h
index 6f5e370..ec2d0b6 100644
--- a/linden/indra/newview/llpanelclassified.h
+++ b/linden/indra/newview/llpanelclassified.h
@@ -91,6 +91,7 @@ public:
    void sendClassifiedInfoRequest();
        void sendClassifiedInfoUpdate();
+        void confirmPublish(S32 option);
    static void processClassifiedInfoReply(LLMessageSystem* msg, void**);
@@ -110,10 +111,11 @@ protected:
        static void onCommitAny(LLUICtrl* ctrl, void* data);
        void sendClassifiedClickMessage(const char* type);
+        BOOL checkDirty();              // Update and return mDirty
 protected:
        BOOL mInFinder;
-        bool mDirty;
+        BOOL mDirty;
        bool mForceClose;
        LLUUID mClassifiedID;
        LLUUID mRequestedID;
@@ -134,7 +136,6 @@ protected:
        // Values the user may change
        LLTextureCtrl*  mSnapshotCtrl;
        LLLineEditor*   mNameEditor;
-        LLLineEditor*   mDateEditor;
        LLTextEditor*   mDescEditor;
        LLLineEditor*   mLocationEditor;
        LLComboBox*             mCategoryCombo;
diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index c4fa1dc..4a03900 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -322,7 +322,7 @@ void LLPanelDisplay::applyResolution()
                // change fullscreen resolution or switch in/out of windowed mode
                BOOL result;
-                BOOL logged_in = (gStartupState >= STATE_STARTED);
+                BOOL logged_in = (LLStartUp::getStartupState() >= STATE_STARTED);
                if (fullscreen)
                {
                        result = gViewerWindow->changeDisplaySettings(TRUE, 
@@ -526,7 +526,7 @@ void LLPanelDisplay2::apply()
        LLImageGL::sGlobalUseAnisotropic = childGetValue("ani");
        if (old_anisotropic != LLImageGL::sGlobalUseAnisotropic)
        {
-                BOOL logged_in = (gStartupState >= STATE_STARTED);
+                BOOL logged_in = (LLStartUp::getStartupState() >= STATE_STARTED);
                gViewerWindow->restartDisplay(logged_in);
        }
@@ -655,9 +655,13 @@ void LLPanelDisplay3::refresh()
 void LLPanelDisplay3::refreshEnabledState()
 {
        // Ripple Water
-        bool ripple = (LLShaderMgr::getMaxVertexShaderLevel(LLShaderMgr::SHADER_ENVIRONMENT) >= 2);
+        bool ripple = (LLShaderMgr::getMaxVertexShaderLevel(LLShaderMgr::SHADER_ENVIRONMENT) >= 2) && gGLManager.mHasCubeMap && gFeatureManagerp->isFeatureAvailable("RenderCubeMap");
        mCtrlRippleWater->setEnabled(ripple ? TRUE : FALSE);
+        // Bump & Shiny
+        bool bumpshiny = gGLManager.mHasCubeMap && gFeatureManagerp->isFeatureAvailable("RenderCubeMap") && gFeatureManagerp->isFeatureAvailable("RenderObjectBump");
+        mCtrlBumpShiny->setEnabled(bumpshiny ? TRUE : FALSE);
        // Avatar Mode
        S32 max_avatar_shader = LLShaderMgr::getMaxVertexShaderLevel(LLShaderMgr::SHADER_AVATAR);
        mCtrlAvatarVP->setEnabled((max_avatar_shader > 0) ? TRUE : FALSE);
diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index 0888cad..8d30f09 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -70,7 +70,6 @@ LLPanelGroupGeneral::LLPanelGroupGeneral(const std::string& name,
        mFounderName(NULL),
        mInsignia(NULL),
        mEditCharter(NULL),
-        mEditName(NULL),
        mBtnJoinGroup(NULL),
        mListVisibleMembers(NULL),
        mCtrlShowInGroupList(NULL),
@@ -256,7 +255,7 @@ BOOL LLPanelGroupGeneral::postBuild()
 void LLPanelGroupGeneral::onCommitAny(LLUICtrl* ctrl, void* data)
 {
        LLPanelGroupGeneral* self = (LLPanelGroupGeneral*)data;
-        self->mChanged = TRUE;
+        self->updateChanged();
        self->notifyObservers();
 }
@@ -811,3 +810,22 @@ void LLPanelGroupGeneral::updateMembers()
                mListVisibleMembers->setEnabled(FALSE);
        }
 }
+void LLPanelGroupGeneral::updateChanged()
+{
+        mChanged = FALSE;
+        if ( mGroupNameEditor )
+                mChanged  = mGroupNameEditor->isDirty();
+        if ( mGroupName )
+                mChanged |= mGroupName->isDirty();
+        if ( mFounderName )
+                mChanged |= mFounderName->isDirty();
+        if ( mInsignia )
+                mChanged |= mInsignia->isDirty();
+        if ( mEditCharter )
+                mChanged |= mEditCharter->isDirty();
+//      if ( mCtrlReceiveNotices )                      // "Receive group notices" is different, see onReceiveNotices()
+//              mChanged |= mCtrlReceiveNotices->isDirty();
+}
diff --git a/linden/indra/newview/llpanelgroupgeneral.h b/linden/indra/newview/llpanelgroupgeneral.h
index 22990a9..a8615b2 100644
--- a/linden/indra/newview/llpanelgroupgeneral.h
+++ b/linden/indra/newview/llpanelgroupgeneral.h
@@ -74,6 +74,7 @@ private:
    static void joinDlgCB(S32 which, void *userdata);
        void updateMembers();
+        void updateChanged();
        BOOL                    mPendingMemberUpdate;
        BOOL                    mChanged;
@@ -88,7 +89,6 @@ private:
        LLNameBox                       *mFounderName;
        LLTextureCtrl           *mInsignia;
        LLTextEditor            *mEditCharter;
-        LLLineEditor            *mEditName;
        LLButton                        *mBtnJoinGroup;
        LLButton                        *mBtnInfo;
diff --git a/linden/indra/newview/llpanelgroupinvite.cpp b/linden/indra/newview/llpanelgroupinvite.cpp
index 7e5429f..4078c6d 100644
--- a/linden/indra/newview/llpanelgroupinvite.cpp
+++ b/linden/indra/newview/llpanelgroupinvite.cpp
@@ -36,6 +36,9 @@
 #include "llgroupmgr.h"
 #include "llnamelistctrl.h"
 #include "llspinctrl.h"
+#include "lltextbox.h"
+#include "llviewerobject.h"
+#include "llviewerobjectlist.h"
 #include "llvieweruictrlfactory.h"
 class LLPanelGroupInvite::impl
@@ -65,7 +68,9 @@ public:
        LLNameListCtrl  *mInvitees;
        LLComboBox      *mRoleNames;
-        LLButton                *mRemoveButton;
+        LLButton                *mOKButton;
+        LLButton                *mRemoveButton;
+        LLTextBox               *mGroupName;
        void (*mCloseCallback)(void* data);
@@ -308,6 +313,8 @@ LLPanelGroupInvite::LLPanelGroupInvite(const std::string& name,
        : LLPanel(name)
 {
        mImplementation = new impl(group_id);
+        mPendingUpdate = FALSE;
+        mStoreSelected = LLUUID::null;
        std::string panel_def_file;
@@ -329,29 +336,132 @@ void LLPanelGroupInvite::setCloseCallback(void (*close_callback)(void*),
 void LLPanelGroupInvite::clear()
 {
+        mStoreSelected = LLUUID::null;
        mImplementation->mInvitees->deleteAllItems();
        mImplementation->mRoleNames->clear();
        mImplementation->mRoleNames->removeall();
+        mImplementation->mOKButton->setEnabled(FALSE);
 }
+void LLPanelGroupInvite::addUsers(std::vector<LLUUID>& agent_ids)
+{
+        std::vector<std::string> names;
+        for (S32 i = 0; i < (S32)agent_ids.size(); i++)
+        {
+                LLUUID agent_id = agent_ids[i];
+                LLViewerObject* dest = gObjectList.findObject(agent_id);
+                if(dest && dest->isAvatar())
+                {
+                        LLString fullname;
+                        LLString::format_map_t args;
+                        LLNameValue* nvfirst = dest->getNVPair("FirstName");
+                        LLNameValue* nvlast = dest->getNVPair("LastName");
+                        if(nvfirst && nvlast)
+                        {
+                                args["[FIRST]"] = nvfirst->getString();
+                                args["[LAST]"] = nvlast->getString();
+                                fullname = nvfirst->getString();
+                                fullname += " ";
+                                fullname += nvlast->getString();
+                        }
+                        if (!fullname.empty())
+                        {
+                                names.push_back(fullname);
+                        } 
+                        else 
+                        {
+                                llwarns << "llPanelGroupInvite: Selected avatar has no name: " << dest->getID() << llendl;
+                                names.push_back("(Unknown)");
+                        }
+                }
+        }
+        mImplementation->addUsers(names, agent_ids);
+}
+void LLPanelGroupInvite::draw()
+{
+        LLPanel::draw();
+        if (mPendingUpdate)
+        {
+                updateLists();
+        }
+}
+ 
 void LLPanelGroupInvite::update()
 {
+        mPendingUpdate = FALSE;
+        if (mImplementation->mGroupName) 
+        {
+                mImplementation->mGroupName->setText("(loading...)");
+        }
+        if ( mImplementation->mRoleNames ) 
+        {
+                mStoreSelected = mImplementation->mRoleNames->getCurrentID();
+                mImplementation->mRoleNames->clear();
+                mImplementation->mRoleNames->removeall();
+                mImplementation->mRoleNames->add("(loading...)", LLUUID::null, ADD_BOTTOM);
+                mImplementation->mRoleNames->setCurrentByID(LLUUID::null);
+        }
+        updateLists();
+}
+void LLPanelGroupInvite::updateLists()
+{
        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mImplementation->mGroupID);
+        BOOL waiting = FALSE;
-        if (!gdatap || !gdatap->isRoleDataComplete())
+        if (gdatap) 
+        {
+                if (gdatap->isGroupPropertiesDataComplete()) 
+                {
+                        if (mImplementation->mGroupName) 
+                        {
+                                mImplementation->mGroupName->setText(gdatap->mName);
+                        }
+                } 
+                else 
+                {
+                        waiting = TRUE;
+                }
+                if (gdatap->isRoleDataComplete() && gdatap->isMemberDataComplete()) 
+                {
+                        if ( mImplementation->mRoleNames )
+                        {
+                                mImplementation->mRoleNames->clear();
+                                mImplementation->mRoleNames->removeall();
+                                //add the role names and select the everybody role by default
+                                mImplementation->addRoleNames(gdatap);
+                                mImplementation->mRoleNames->setCurrentByID(mStoreSelected);
+                        }
+                } 
+                else 
+                {
+                        waiting = TRUE;
+                }
+        } 
+        else 
        {
-                gGroupMgr->sendGroupRoleDataRequest(mImplementation->mGroupID);
+                waiting = TRUE;
        }
+        if (waiting) 
+        {
+                if (!mPendingUpdate) 
+                {
+                        gGroupMgr->sendGroupPropertiesRequest(mImplementation->mGroupID);
+                        gGroupMgr->sendGroupMembersRequest(mImplementation->mGroupID);
+                        gGroupMgr->sendGroupRoleDataRequest(mImplementation->mGroupID);
+                }
+                mPendingUpdate = TRUE;
+        } 
        else
        {
-                if ( mImplementation->mRoleNames )
+                mPendingUpdate = FALSE;
+                if (mImplementation->mOKButton && mImplementation->mRoleNames->getItemCount()) 
                {
-                        mImplementation->mRoleNames->clear();
+                        mImplementation->mOKButton->setEnabled(TRUE);
-                        mImplementation->mRoleNames->removeall();
-                        //add the role names and select the everybody role by default
-                        mImplementation->addRoleNames(gdatap);
-                        mImplementation->mRoleNames->setCurrentByID(LLUUID::null);
                }
        }
 }
@@ -362,6 +472,7 @@ BOOL LLPanelGroupInvite::postBuild()
        mImplementation->mRoleNames = (LLComboBox*) getChildByName("role_name",
                                                                                                                           recurse);
+        mImplementation->mGroupName = (LLTextBox*) getChildByName("group_name_text", recurse);
        mImplementation->mInvitees = 
                (LLNameListCtrl*) getChildByName("invitee_list", recurse);
        if ( mImplementation->mInvitees )
@@ -390,12 +501,15 @@ BOOL LLPanelGroupInvite::postBuild()
                mImplementation->mRemoveButton->setEnabled(FALSE);
        }
-        button = (LLButton*) getChildByName("ok_button", recurse);
+        mImplementation->mOKButton = 
-        if ( button )
+                (LLButton*) getChildByName("ok_button", recurse);
-        {
+        if ( mImplementation->mOKButton )
-                button->setClickedCallback(impl::callbackClickOK);
+        {
-                button->setCallbackUserData(mImplementation);
+                mImplementation->mOKButton->
-        }
+                                setClickedCallback(impl::callbackClickOK);
+                mImplementation->mOKButton->setCallbackUserData(mImplementation);
+                mImplementation->mOKButton->setEnabled(FALSE);
+        }
        button = (LLButton*) getChildByName("cancel_button", recurse);
        if ( button )
diff --git a/linden/indra/newview/llpanelgroupinvite.h b/linden/indra/newview/llpanelgroupinvite.h
index 260b091..40e9701 100644
--- a/linden/indra/newview/llpanelgroupinvite.h
+++ b/linden/indra/newview/llpanelgroupinvite.h
@@ -37,16 +37,22 @@ class LLPanelGroupInvite
 public:
        LLPanelGroupInvite(const std::string& name, const LLUUID& group_id);
        ~LLPanelGroupInvite();
+        
+        void addUsers(std::vector<LLUUID>& agent_ids);
        void clear();
        void update();
        void setCloseCallback(void (*close_callback)(void*), void* data);
+        virtual void draw();
        virtual BOOL postBuild();
 protected:
        class impl;
        impl* mImplementation;
+        BOOL mPendingUpdate;
+        LLUUID mStoreSelected;
+        void updateLists();
 };
 #endif
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 7a0482b..2df1097 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -36,7 +36,7 @@
 #include "llmd5.h"
 #include "llsecondlifeurls.h"
 #include "llwindow.h"                   // shell_open()
-#include "llversion.h"
+#include "llversionviewer.h"
 #include "v4color.h"
 #include "llbutton.h"
@@ -139,6 +139,9 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
        {
                llwarns << "Duplicate instance of login view deleted" << llendl;
                delete LLPanelLogin::sInstance;
+                // Don't leave bad pointer in gFocusMgr
+                gFocusMgr.setDefaultKeyboardFocus(NULL);
        }
        LLPanelLogin::sInstance = this;
@@ -525,9 +528,10 @@ void LLPanelLogin::show(const LLRect &rect,
        {
                // Grab focus and move cursor to first enabled control
                sInstance->setFocus(TRUE);
-                // make sure that focus always goes here
-                gFocusMgr.setDefaultKeyboardFocus(sInstance);
        }
+        // Make sure that focus always goes here (and use the latest sInstance that was just created)
+        gFocusMgr.setDefaultKeyboardFocus(sInstance);
 }
 // static
@@ -608,35 +612,40 @@ void LLPanelLogin::getFields(LLString &firstname, LLString &lastname, LLString &
 }
-// static
+// static.  Return TRUE if user made a choice from the popup
-void LLPanelLogin::getServer(LLString &server, S32 &domain_name)
+BOOL LLPanelLogin::getServer(LLString &server, S32 &domain_name)
 {
+        BOOL user_picked = FALSE;
        if (!sInstance)
        {
                llwarns << "Attempted getServer with no login view shown" << llendl;
-                return;
        }
+        else
-        LLComboBox* combo = LLUICtrlFactory::getComboBoxByName(sInstance, "server_combo");
-        if (combo)
        {
-                LLSD combo_val = combo->getValue();
+                LLComboBox* combo = LLUICtrlFactory::getComboBoxByName(sInstance, "server_combo");
-                if (LLSD::TypeInteger == combo_val.type())
+                if (combo)
                {
-                        domain_name = combo->getValue().asInteger();
+                        LLSD combo_val = combo->getValue();
+                        if (LLSD::TypeInteger == combo_val.type())
+                        {
+                                domain_name = combo->getValue().asInteger();
-                        if ((S32)USERSERVER_OTHER == domain_name)
+                                if ((S32)USERSERVER_OTHER == domain_name)
+                                {
+                                        server = gUserServerName;
+                                }
+                        }
+                        else
                        {
-                                server = gUserServerName;
+                                // no valid selection, return other
+                                domain_name = (S32)USERSERVER_OTHER;
+                                server = combo_val.asString();
                        }
-                }
+                        user_picked = combo->isDirty();
-                else
-                {
-                        // no valid selection, return other
-                        domain_name = (S32)USERSERVER_OTHER;
-                        server = combo_val.asString();
                }
        }
+        return user_picked;
 }
 // static
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index 05590d3..7faf0d8 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -69,7 +69,7 @@ public:
        static void getFields(LLString &firstname, LLString &lastname,
                LLString &password, BOOL &remember);
-        static void getServer(LLString &server, S32& domain_name);
+        static BOOL getServer(LLString &server, S32& domain_name);
        static void getLocation(LLString &location);
        static void close();
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 3e7be68..a8411df 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -286,6 +286,10 @@ BOOL	LLPanelObject::postBuild()
                }
        }
+        mLabelSculptType = gUICtrlFactory->getTextBoxByName(this, "label sculpt type");
+        mCtrlSculptType = gUICtrlFactory->getComboBoxByName(this, "sculpt type control");
+        childSetCommitCallback("sculpt type control", onCommitSculptType, this);
        
        // Start with everyone disabled
        clearCtrls();
@@ -1035,7 +1039,10 @@ void LLPanelObject::getState( )
        mLabelRevolutions->setVisible( revolutions_visible );
        mSpinRevolutions ->setVisible( revolutions_visible );
-        mCtrlSculptTexture->setVisible( sculpt_texture_visible );
+        bool sculpt_type_visible = FALSE; // currently not visible - for LSL setting only
+        mCtrlSculptTexture->setVisible(sculpt_texture_visible);
+        mLabelSculptType->setVisible(sculpt_texture_visible && sculpt_type_visible);
+        mCtrlSculptType->setVisible(sculpt_texture_visible && sculpt_type_visible);
        // sculpt texture
@@ -1045,21 +1052,39 @@ void LLPanelObject::getState( )
        LLUUID id;
                LLSculptParams *sculpt_params = (LLSculptParams *)objectp->getParameterEntry(LLNetworkData::PARAMS_SCULPT);
-                LLTextureCtrl*  mTextureCtrl = LLViewerUICtrlFactory::getTexturePickerByName(this,"sculpt texture control");
+                
-                if((mTextureCtrl) && (sculpt_params))
+                if (sculpt_params) // if we have a legal sculpt param block for this object:
                {
-                        mTextureCtrl->setTentative(FALSE);
-                        mTextureCtrl->setEnabled(editable);
-                        if (editable)
-                                mTextureCtrl->setImageAssetID(sculpt_params->getSculptTexture());
-                        else
-                                mTextureCtrl->setImageAssetID(LLUUID::null);
-                                
                        if (mObject != objectp)  // we've just selected a new object, so save for undo
+                        {
                                mSculptTextureRevert = sculpt_params->getSculptTexture();
-                }
+                                mSculptTypeRevert    = sculpt_params->getSculptType();
+                        }
+                
+                        LLTextureCtrl*  mTextureCtrl = LLViewerUICtrlFactory::getTexturePickerByName(this,"sculpt texture control");
+                        if(mTextureCtrl)
+                        {
+                                mTextureCtrl->setTentative(FALSE);
+                                mTextureCtrl->setEnabled(editable);
+                                if (editable)
+                                        mTextureCtrl->setImageAssetID(sculpt_params->getSculptTexture());
+                                else
+                                        mTextureCtrl->setImageAssetID(LLUUID::null);
+                        }
+                        if (mCtrlSculptType)
+                        {
+                                mCtrlSculptType->setCurrentByIndex(sculpt_params->getSculptType());
+                                mCtrlSculptType->setEnabled(editable);
+                        }
+                        if (mLabelSculptType)
+                        {
+                                mLabelSculptType->setEnabled(TRUE);
+                        }
+                        
+                }
        }
        
@@ -1194,7 +1219,7 @@ void LLPanelObject::onCommitParametric( LLUICtrl* ctrl, void* userdata )
                self->mObject->setParameterEntryInUse(LLNetworkData::PARAMS_SCULPT, TRUE, TRUE);
                LLSculptParams *sculpt_params = (LLSculptParams *)self->mObject->getParameterEntry(LLNetworkData::PARAMS_SCULPT);
                if (sculpt_params)
-                        volume_params.setSculptID(sculpt_params->getSculptTexture(), 0);
+                        volume_params.setSculptID(sculpt_params->getSculptTexture(), sculpt_params->getSculptType());
        }
        else
        {
@@ -1648,13 +1673,16 @@ void LLPanelObject::sendPosition()
 void LLPanelObject::sendSculpt()
 {
-        LLTextureCtrl* mTextureCtrl = gUICtrlFactory->getTexturePickerByName(this,"sculpt texture control");
+        if (mObject.isNull())
-        if(!mTextureCtrl)
                return;
+        
        LLSculptParams sculpt_params;
-        sculpt_params.setSculptTexture(mTextureCtrl->getImageAssetID());
-        sculpt_params.setSculptType(LL_SCULPT_TYPE_SPHERE);
+        if (mCtrlSculptTexture)
+                sculpt_params.setSculptTexture(mCtrlSculptTexture->getImageAssetID());
+        if (mCtrlSculptType)
+                sculpt_params.setSculptType(mCtrlSculptType->getCurrentIndex());
        
        mObject->setParameterEntry(LLNetworkData::PARAMS_SCULPT, sculpt_params, TRUE);
 }
@@ -1863,7 +1891,9 @@ void LLPanelObject::onSelectSculpt(LLUICtrl* ctrl, void* userdata)
    LLTextureCtrl* mTextureCtrl = gUICtrlFactory->getTexturePickerByName(self, "sculpt texture control");
        if (mTextureCtrl)
+        {
                self->mSculptTextureRevert = mTextureCtrl->getImageAssetID();
+        }
        
        self->sendSculpt();
 }
@@ -1890,7 +1920,6 @@ BOOL LLPanelObject::onDropSculpt(LLUICtrl*, LLInventoryItem* item, void* userdat
                mTextureCtrl->setImageAssetID(asset);
                self->mSculptTextureRevert = asset;
        }
-        
        return TRUE;
 }
@@ -1909,3 +1938,11 @@ void LLPanelObject::onCancelSculpt(LLUICtrl* ctrl, void* userdata)
        
        self->sendSculpt();
 }
+// static
+void LLPanelObject::onCommitSculptType(LLUICtrl *ctrl, void* userdata)
+{
+        LLPanelObject* self = (LLPanelObject*) userdata;
+        self->sendSculpt();
+}
diff --git a/linden/indra/newview/llpanelobject.h b/linden/indra/newview/llpanelobject.h
index c734b38..ac0b96c 100644
--- a/linden/indra/newview/llpanelobject.h
+++ b/linden/indra/newview/llpanelobject.h
@@ -77,7 +77,9 @@ public:
        static void     onCommitSculpt(        LLUICtrl* ctrl, void* userdata);
        static void     onCancelSculpt(        LLUICtrl* ctrl, void* userdata);
        static void     onSelectSculpt(        LLUICtrl* ctrl, void* userdata);
-        static BOOL     onDropSculpt(LLUICtrl* ctrl, LLInventoryItem* item, void* ud);
+        static BOOL     onDropSculpt(          LLUICtrl* ctrl, LLInventoryItem* item, void* ud);
+        static void     onCommitSculptType(    LLUICtrl *ctrl, void* userdata);
+                
        
 protected:
        void                    getState();
@@ -163,6 +165,8 @@ protected:
        LLCheckBoxCtrl  *mCheckCastShadows;
        LLTextureCtrl   *mCtrlSculptTexture;
+        LLTextBox       *mLabelSculptType;
+        LLComboBox      *mCtrlSculptType;
        
        LLVector3               mCurEulerDegrees;               // to avoid sending rotation when not changed
        BOOL                    mIsPhysical;                    // to avoid sending "physical" when not changed
@@ -172,6 +176,7 @@ protected:
        S32                             mSelectedType;                  // So we know what selected type we last were
        LLUUID          mSculptTextureRevert;   // so we can revert the sculpt texture on cancel
+        U8              mSculptTypeRevert;      // so we can revert the sculpt type on cancel
        
        LLPointer<LLViewerObject> mObject;
        LLPointer<LLViewerObject> mRootObject;
diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index 738c340..fad1742 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -155,7 +155,7 @@ BOOL LLPrefsIMImpl::postBuild()
        childSetText("log_path_string", mLogPath);
        childSetValue("log_instant_messages", mLogInstantMessages); 
        childSetValue("log_chat", mLogChat); 
-        childSetValue("log_show_history", mIMLogTimestamp);
+        childSetValue("log_show_history", mLogShowHistory);
        childSetValue("log_instant_messages_timestamp", mIMLogTimestamp);
        childSetValue("log_chat_timestamp", mLogChatTimestamp);
        childSetValue("log_chat_IM", mLogIMChat);
diff --git a/linden/indra/newview/llprefsvoice.h b/linden/indra/newview/llprefsvoice.h
index e6b861d..4e48fd7 100644
--- a/linden/indra/newview/llprefsvoice.h
+++ b/linden/indra/newview/llprefsvoice.h
@@ -1,8 +1,8 @@
-/** 
+/** 
- * @file llprefsvoice.h
+ * @file llprefsvoice.h
- * @brief Voice chat preferences panel
+ * @brief Voice chat preferences panel
- *
+ *
- * Copyright (c) 2003-2007, Linden Research, Inc.
+ * Copyright (c) 2003-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -23,18 +23,18 @@
 * 
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * COMPLETENESS OR PERFORMANCE.
- */
+ */
-#ifndef LLPREFSVOICE_H
+#ifndef LLPREFSVOICE_H
-#define LLPREFSVOICE_H
+#define LLPREFSVOICE_H
-#include "llpanel.h"
+#include "llpanel.h"
-class LLFloaterDeviceSettings;
+class LLFloaterDeviceSettings;
-class LLPrefsVoiceLogic
+class LLPrefsVoiceLogic
-{
+{
 public:
        LLPrefsVoiceLogic(LLPanel* panelp);
        virtual ~LLPrefsVoiceLogic(){};
@@ -51,8 +51,8 @@ protected:
        static void onClickSetKey(void* user_data);
        static void onClickSetMiddleMouse(void* user_data);
-        static void onEarLocationCommit(LLUICtrl* ctrl, void* user_data);
+        static void onEarLocationCommit(LLUICtrl* ctrl, void* user_data);
-        static void onClickLaunchWizard(void* user_data);
+        static void onClickLaunchWizard(void* user_data);
        BOOL mEnableVoice;
        BOOL mVoiceCallsFriendsOnly;
@@ -60,28 +60,28 @@ protected:
        std::string mModifier;
        BOOL mPushToTalkToggle;
        S32  mEarLocation;
-        LLCtrlSelectionInterface        *mCtrlEarLocation;
+        LLCtrlSelectionInterface        *mCtrlEarLocation;
        
        BOOL mEatNextSetKeyClick;
        LLPanel* mPanel;
-};
+};
-class LLPrefsVoice : public LLPanel
+class LLPrefsVoice : public LLPanel
-{
+{
-public:
+public:
-        LLPrefsVoice();
+        LLPrefsVoice();
-        ~LLPrefsVoice();
+        ~LLPrefsVoice();
-        /*virtual*/ void draw();
+        /*virtual*/ void draw();
-        void apply();
+        void apply();
-        void cancel();
+        void cancel();
-protected:
+protected:
-        static void onClickDeviceSettingsBtn(void* user_data);
+        static void onClickDeviceSettingsBtn(void* user_data);
-        LLPrefsVoiceLogic* mLogic;
+        LLPrefsVoiceLogic* mLogic;
-        LLFloaterDeviceSettings* mDeviceSettings;
+        LLFloaterDeviceSettings* mDeviceSettings;
-};
+};
-#endif // LLPREFSVOICE_H
+#endif // LLPREFSVOICE_H
diff --git a/linden/indra/newview/llpreview.cpp b/linden/indra/newview/llpreview.cpp
index 751a90f..4993852 100644
--- a/linden/indra/newview/llpreview.cpp
+++ b/linden/indra/newview/llpreview.cpp
@@ -300,12 +300,18 @@ bool LLPreview::save( const LLUUID& item_uuid, LLPointer<LLInventoryItem>* itemp
 }
 // static
-void LLPreview::hide(const LLUUID& item_uuid)
+void LLPreview::hide(const LLUUID& item_uuid, BOOL no_saving /* = FALSE */ )
 {
        preview_map_t::iterator found_it = LLPreview::sInstances.find(item_uuid);
        if(found_it != LLPreview::sInstances.end())
        {
                LLPreview* instance = found_it->second;
+                if ( no_saving )
+                {
+                        instance->mForceClose = TRUE;
+                }
                instance->close();
        }
 }
diff --git a/linden/indra/newview/llpreview.h b/linden/indra/newview/llpreview.h
index 0369227..dcf7fbb 100644
--- a/linden/indra/newview/llpreview.h
+++ b/linden/indra/newview/llpreview.h
@@ -81,7 +81,7 @@ public:
        static LLPreview* find(const LLUUID& item_uuid);
        static LLPreview*       show(const LLUUID& item_uuid, BOOL take_focus = TRUE );
-        static void                     hide(const LLUUID& item_uuid);
+        static void                     hide(const LLUUID& item_uuid, BOOL no_saving = FALSE );
        static void                     rename(const LLUUID& item_uuid, const std::string& new_name);
        static bool                     save(const LLUUID& item_uuid, LLPointer<LLInventoryItem>* itemptr);
diff --git a/linden/indra/newview/llpreviewgesture.cpp b/linden/indra/newview/llpreviewgesture.cpp
index 23e6aa5..1afa523 100644
--- a/linden/indra/newview/llpreviewgesture.cpp
+++ b/linden/indra/newview/llpreviewgesture.cpp
@@ -266,7 +266,8 @@ BOOL LLPreviewGesture::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 // virtual
 BOOL LLPreviewGesture::canClose()
 {
-        if(!mDirty)
+        if(!mDirty || mForceClose)
        {
                return TRUE;
        }
@@ -884,7 +885,7 @@ void LLPreviewGesture::loadAsset()
 void LLPreviewGesture::onLoadComplete(LLVFS *vfs,
                                                                           const LLUUID& asset_uuid,
                                                                           LLAssetType::EType type,
-                                                                           void* user_data, S32 status)
+                                                                           void* user_data, S32 status, LLExtStat ext_status)
 {
        LLUUID* item_idp = (LLUUID*)user_data;
        LLPreview* preview = LLPreview::find(*item_idp);
@@ -1180,7 +1181,7 @@ void LLPreviewGesture::saveIfNeeded()
 // TODO: This is very similar to LLPreviewNotecard::onSaveComplete.
 // Could merge code.
 // static
-void LLPreviewGesture::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status) // StoreAssetData callback (fixed)
+void LLPreviewGesture::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
        LLSaveInfo* info = (LLSaveInfo*)user_data;
        if (info && (status == 0))
diff --git a/linden/indra/newview/llpreviewgesture.h b/linden/indra/newview/llpreviewgesture.h
index e0ccffd..a7abb7e 100644
--- a/linden/indra/newview/llpreviewgesture.h
+++ b/linden/indra/newview/llpreviewgesture.h
@@ -87,7 +87,7 @@ protected:
        static void onLoadComplete(LLVFS *vfs,
                                                           const LLUUID& asset_uuid,
                                                           LLAssetType::EType type,
-                                                           void* user_data, S32 status);
+                                                           void* user_data, S32 status, LLExtStat ext_status);
        void loadUIFromGesture(LLMultiGesture* gesture);
@@ -95,7 +95,7 @@ protected:
        static void onSaveComplete(const LLUUID& asset_uuid,
                                                           void* user_data,
-                                                           S32 status);
+                                                           S32 status, LLExtStat ext_status);
        static void handleSaveChangesDialog(S32 option, void* userdata);
diff --git a/linden/indra/newview/llpreviewnotecard.cpp b/linden/indra/newview/llpreviewnotecard.cpp
index 5943b3e..ce37d64 100644
--- a/linden/indra/newview/llpreviewnotecard.cpp
+++ b/linden/indra/newview/llpreviewnotecard.cpp
@@ -349,7 +349,7 @@ void LLPreviewNotecard::loadAsset()
 void LLPreviewNotecard::onLoadComplete(LLVFS *vfs,
                                                                           const LLUUID& asset_uuid,
                                                                           LLAssetType::EType type,
-                                                                           void* user_data, S32 status)
+                                                                           void* user_data, S32 status, LLExtStat ext_status)
 {
        llinfos << "LLPreviewNotecard::onLoadComplete()" << llendl;
        LLUUID* item_id = (LLUUID*)user_data;
@@ -537,7 +537,7 @@ bool LLPreviewNotecard::saveIfNeeded(LLInventoryItem* copyitem)
 }
 // static
-void LLPreviewNotecard::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status) // StoreAssetData callback (fixed)
+void LLPreviewNotecard::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
        LLSaveNotecardInfo* info = (LLSaveNotecardInfo*)user_data;
        if(info && (0 == status))
diff --git a/linden/indra/newview/llpreviewnotecard.h b/linden/indra/newview/llpreviewnotecard.h
index 715abac..6a52b1f 100644
--- a/linden/indra/newview/llpreviewnotecard.h
+++ b/linden/indra/newview/llpreviewnotecard.h
@@ -89,13 +89,13 @@ protected:
        static void onLoadComplete(LLVFS *vfs,
                                                           const LLUUID& asset_uuid,
                                                           LLAssetType::EType type,
-                                                           void* user_data, S32 status);
+                                                           void* user_data, S32 status, LLExtStat ext_status);
        static void onClickSave(void* data);
        static void onSaveComplete(const LLUUID& asset_uuid,
                                                           void* user_data,
-                                                           S32 status);
+                                                           S32 status, LLExtStat ext_status);
        static void handleSaveChangesDialog(S32 option, void* userdata);
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index a2ea141..cce672b 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -291,6 +291,7 @@ LLScriptEdCore::LLScriptEdCore(
        const LLViewHandle& floater_handle,
        void (*load_callback)(void*),
        void (*save_callback)(void*, BOOL),
+        void (*search_replace_callback) (void* userdata),
        void* userdata,
        S32 bottom_pad)
        :
@@ -300,6 +301,7 @@ LLScriptEdCore::LLScriptEdCore(
        mEditor( NULL ),
        mLoadCallback( load_callback ),
        mSaveCallback( save_callback ),
+        mSearchReplaceCallback( search_replace_callback ),
        mUserdata( userdata ),
        mForceClose( FALSE ),
        mLastHelpToken(NULL),
@@ -1028,7 +1030,9 @@ BOOL LLScriptEdCore::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
 {
        if(getVisible() && getEnabled())
        {
-                if(('S' == key) && (MASK_CONTROL == (mask & MASK_CONTROL)))
+                bool just_control = MASK_CONTROL == (mask & MASK_MODIFIERS);
+                if(('S' == key) && just_control)
                {
                        if(mSaveCallback)
                        {
@@ -1038,6 +1042,16 @@ BOOL LLScriptEdCore::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
        
                        return TRUE;
                }
+                if(('F' == key) && just_control)
+                {
+                        if(mSearchReplaceCallback)
+                        {
+                                mSearchReplaceCallback(mUserdata);
+                        }
+        
+                        return TRUE;
+                }
        }
        return FALSE;
 }
@@ -1071,6 +1085,7 @@ void* LLPreviewLSL::createScriptEdPanel(void* userdata)
                                                                   self->mViewHandle,
                                                                   LLPreviewLSL::onLoad,
                                                                   LLPreviewLSL::onSave,
+                                                                   LLPreviewLSL::onSearchReplace,
                                                                   self,
                                                                   0);
@@ -1220,6 +1235,13 @@ void LLPreviewLSL::open()		/*Flawfinder: ignore*/
        LLFloater::open();              /*Flawfinder: ignore*/
 }
+void LLPreviewLSL::onSearchReplace(void* userdata)
+{
+        LLPreviewLSL* self = (LLPreviewLSL*)userdata;
+        LLScriptEdCore* sec = self->mScriptEd; 
+        LLFloaterScriptSearch::show(sec);
+}
 // static
 void LLPreviewLSL::onLoad(void* userdata)
 {
@@ -1386,7 +1408,7 @@ void LLPreviewLSL::uploadAssetLegacy(const std::string& filename,
 // static
-void LLPreviewLSL::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status) // StoreAssetData callback (fixed)
+void LLPreviewLSL::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
        LLScriptSaveInfo* info = reinterpret_cast<LLScriptSaveInfo*>(user_data);
        if(0 == status)
@@ -1435,7 +1457,7 @@ void LLPreviewLSL::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32
 }
 // static
-void LLPreviewLSL::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status) // StoreAssetData callback (fixed)
+void LLPreviewLSL::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
        LLUUID* instance_uuid = (LLUUID*)user_data;
        LLPreviewLSL* self = NULL;
@@ -1474,7 +1496,7 @@ void LLPreviewLSL::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_d
 // static
 void LLPreviewLSL::onLoadComplete( LLVFS *vfs, const LLUUID& asset_uuid, LLAssetType::EType type,
-                                                                   void* user_data, S32 status)
+                                                                   void* user_data, S32 status, LLExtStat ext_status)
 {
        lldebugs << "LLPreviewLSL::onLoadComplete: got uuid " << asset_uuid
                 << llendl;
@@ -1579,6 +1601,7 @@ void* LLLiveLSLEditor::createScriptEdPanel(void* userdata)
                                                                   self->mViewHandle,
                                                                   &LLLiveLSLEditor::onLoad,
                                                                   &LLLiveLSLEditor::onSave,
+                                                                   &LLLiveLSLEditor::onSearchReplace,
                                                                   self,
                                                                   0);
@@ -1793,7 +1816,7 @@ void LLLiveLSLEditor::loadAsset(BOOL is_new)
 // static
 void LLLiveLSLEditor::onLoadComplete(LLVFS *vfs, const LLUUID& asset_id,
                                                                         LLAssetType::EType type,
-                                                                         void* user_data, S32 status)
+                                                                         void* user_data, S32 status, LLExtStat ext_status)
 {
        lldebugs << "LLLiveLSLEditor::onLoadComplete: got uuid " << asset_id
                 << llendl;
@@ -1976,6 +1999,15 @@ void LLLiveLSLEditor::draw()
        }
 }
+void LLLiveLSLEditor::onSearchReplace(void* userdata)
+{
+        LLLiveLSLEditor* self = (LLLiveLSLEditor*)userdata;
+        LLScriptEdCore* sec = self->mScriptEd; 
+        LLFloaterScriptSearch::show(sec);
+}
 struct LLLiveLSLSaveData
 {
        LLLiveLSLSaveData(const LLUUID& id, const LLViewerInventoryItem* item, BOOL active);
@@ -2189,7 +2221,7 @@ void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
        runningCheckbox->setEnabled(TRUE);
 }
-void LLLiveLSLEditor::onSaveTextComplete(const LLUUID& asset_uuid, void* user_data, S32 status) // StoreAssetData callback (fixed)
+void LLLiveLSLEditor::onSaveTextComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
        LLLiveLSLSaveData* data = (LLLiveLSLSaveData*)user_data;
@@ -2219,7 +2251,7 @@ void LLLiveLSLEditor::onSaveTextComplete(const LLUUID& asset_uuid, void* user_da
 }
-void LLLiveLSLEditor::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status) // StoreAssetData callback (fixed)
+void LLLiveLSLEditor::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
        LLLiveLSLSaveData* data = (LLLiveLSLSaveData*)user_data;
        if(!data)
diff --git a/linden/indra/newview/llpreviewscript.h b/linden/indra/newview/llpreviewscript.h
index 4aadc8b..9cc0e46 100644
--- a/linden/indra/newview/llpreviewscript.h
+++ b/linden/indra/newview/llpreviewscript.h
@@ -67,6 +67,7 @@ public:
                const LLViewHandle& floater_handle,
                void (*load_callback)(void* userdata),
                void (*save_callback)(void* userdata, BOOL close_after_save),
+                void (*search_replace_callback)(void* userdata),
                void* userdata,
                S32 bottom_pad = 0);    // pad below bottom row of buttons
        ~LLScriptEdCore();
@@ -130,6 +131,7 @@ private:
        LLTextEditor*   mEditor;
        void                    (*mLoadCallback)(void* userdata);
        void                    (*mSaveCallback)(void* userdata, BOOL close_after_save);
+        void                    (*mSearchReplaceCallback) (void* userdata);
        void*                   mUserdata;
        LLComboBox              *mFunctions;
        BOOL                    mForceClose;
@@ -169,14 +171,15 @@ protected:
                                                        const LLUUID& item_id,
                                                        const LLTransactionID& tid);
+        static void onSearchReplace(void* userdata);
        static void onLoad(void* userdata);
        static void onSave(void* userdata, BOOL close_after_save);
        
        static void onLoadComplete(LLVFS *vfs, const LLUUID& uuid,
                                                           LLAssetType::EType type,
-                                                           void* user_data, S32 status);
+                                                           void* user_data, S32 status, LLExtStat ext_status);
-        static void onSaveComplete(const LLUUID& uuid, void* user_data, S32 status);
+        static void onSaveComplete(const LLUUID& uuid, void* user_data, S32 status, LLExtStat ext_status);
-        static void onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status);
+        static void onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
        static LLPreviewLSL* getInstance(const LLUUID& uuid);
        static void* createScriptEdPanel(void* userdata);
@@ -229,14 +232,15 @@ protected:
                                                   const LLTransactionID& tid,
                                                   BOOL is_running);
+        static void onSearchReplace(void* userdata);
        static void onLoad(void* userdata);
        static void onSave(void* userdata, BOOL close_after_save);
        static void onLoadComplete(LLVFS *vfs, const LLUUID& asset_uuid,
                                                           LLAssetType::EType type,
-                                                           void* user_data, S32 status);
+                                                           void* user_data, S32 status, LLExtStat ext_status);
-        static void onSaveTextComplete(const LLUUID& asset_uuid, void* user_data, S32 status);
+        static void onSaveTextComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
-        static void onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status);
+        static void onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
        static void onRunningCheckboxClicked(LLUICtrl*, void* userdata);
        static void onReset(void* userdata);
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index 283b38b..00bb724 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -71,7 +71,7 @@ void sg_assert(BOOL expr)
 #endif
 }
-#if !LL_RELEASE_FOR_DOWNLOAD
+#if LL_DEBUG
 void validate_drawable(LLDrawable* drawablep)
 {
        F64 rad = drawablep->getBinRadius();
@@ -153,10 +153,6 @@ LLSpatialGroup::~LLSpatialGroup()
 void LLSpatialGroup::clearDrawMap()
 {
-        for (LLSpatialGroup::draw_map_t::iterator i = mDrawMap.begin(); i != mDrawMap.end(); ++i)
-        {
-                std::for_each(i->second.begin(), i->second.end(), DeletePointer());
-        }
        mDrawMap.clear();
 }
@@ -2323,7 +2319,7 @@ void pushVerts(LLSpatialGroup* group, U32 mask)
        for (LLSpatialGroup::draw_map_t::iterator i = group->mDrawMap.begin(); i != group->mDrawMap.end(); ++i)
        {
-                for (std::vector<LLDrawInfo*>::iterator j = i->second.begin(); j != i->second.end(); ++j)
+                for (LLSpatialGroup::drawmap_elem_t::iterator j = i->second.begin(); j != i->second.end(); ++j) 
                {
                        params = *j;
                        pushVerts(params, mask);
@@ -2351,7 +2347,7 @@ void pushVertsColorCoded(LLSpatialGroup* group, U32 mask)
        for (LLSpatialGroup::draw_map_t::iterator i = group->mDrawMap.begin(); i != group->mDrawMap.end(); ++i)
        {
-                for (std::vector<LLDrawInfo*>::iterator j = i->second.begin(); j != i->second.end(); ++j)
+                for (LLSpatialGroup::drawmap_elem_t::iterator j = i->second.begin(); j != i->second.end(); ++j) 
                {
                        params = *j;
                        glColor4f(colors[col].mV[0], colors[col].mV[1], colors[col].mV[2], 0.5f);
@@ -2702,8 +2698,8 @@ public:
                
                for (LLSpatialGroup::draw_map_t::iterator i = group->mDrawMap.begin(); i != group->mDrawMap.end(); ++i)
                {
-                        std::vector<LLDrawInfo*>& draw_vec = i->second;
+                        LLSpatialGroup::drawmap_elem_t& draw_vec = i->second;   
-                        for (std::vector<LLDrawInfo*>::iterator j = draw_vec.begin(); j != draw_vec.end(); ++j)
+                        for (LLSpatialGroup::drawmap_elem_t::iterator j = draw_vec.begin(); j != draw_vec.end(); ++j)   
                        {
                                LLDrawInfo* draw_info = *j;
                                if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXTURE_ANIM))
@@ -2889,6 +2885,11 @@ LLDrawInfo::LLDrawInfo(U32 start, U32 end, U32 count, U32 offset,
 {
 }
+LLDrawInfo::~LLDrawInfo()       
+{
+}
 LLVertexBuffer* LLGeometryManager::createVertexBuffer(U32 type_mask, U32 usage)
 {
        return new LLVertexBuffer(type_mask, usage);
diff --git a/linden/indra/newview/llspatialpartition.h b/linden/indra/newview/llspatialpartition.h
index 3046b73..31ec040 100644
--- a/linden/indra/newview/llspatialpartition.h
+++ b/linden/indra/newview/llspatialpartition.h
@@ -46,13 +46,17 @@
 class LLSpatialPartition;
 class LLSpatialBridge;
-class LLDrawInfo
+class LLDrawInfo : public LLRefCount 
 {
+protected:
+        ~LLDrawInfo();  
+        
 public:
        LLDrawInfo(U32 start, U32 end, U32 count, U32 offset, 
                                LLViewerImage* image, LLVertexBuffer* buffer, 
                                BOOL fullbright = FALSE, U8 bump = 0, BOOL particle = FALSE, F32 part_size = 0);
        
        LLPointer<LLVertexBuffer> mVertexBuffer;
        LLPointer<LLViewerImage> mTexture;
        LLPointer<LLCubeMap> mReflectionMap;
@@ -78,18 +82,21 @@ public:
        struct CompareTexturePtr
        {
-                bool operator()(const LLDrawInfo* const& lhs, const LLDrawInfo* const& rhs)
+                bool operator()(const LLPointer<LLDrawInfo>& lhs, const LLPointer<LLDrawInfo>& rhs)     
                {
-                
+                        // sort by pointer, sort NULL down to the end
-                        return lhs == NULL || rhs == NULL || lhs->mTexture > rhs->mTexture;
+                        return lhs.get() != rhs.get() 
+                                                && (lhs.isNull() || (rhs.notNull() && lhs->mTexture.get() > rhs->mTexture.get()));
                }
        };
        struct CompareBump
        {
-                bool operator()(const LLDrawInfo* const& lhs, const LLDrawInfo* const& rhs)
+                bool operator()(const LLPointer<LLDrawInfo>& lhs, const LLPointer<LLDrawInfo>& rhs) 
                {
-                        return lhs == NULL || rhs == NULL || lhs->mBump > rhs->mBump;
+                        // sort by mBump value, sort NULL down to the end
+                        return lhs.get() != rhs.get() 
+                                                && (lhs.isNull() || (rhs.notNull() && lhs->mBump > rhs->mBump));
                }
        };
 };
@@ -102,7 +109,8 @@ public:
        typedef std::vector<LLPointer<LLSpatialGroup> > sg_vector_t;
        typedef std::set<LLPointer<LLSpatialGroup> > sg_set_t;
        typedef std::vector<LLPointer<LLSpatialBridge> > bridge_list_t;
-        typedef std::map<U32, std::vector<LLDrawInfo*> > draw_map_t;
+        typedef std::vector<LLPointer<LLDrawInfo> > drawmap_elem_t; 
+        typedef std::map<U32, drawmap_elem_t > draw_map_t;      
        typedef std::map<LLPointer<LLViewerImage>, LLPointer<LLVertexBuffer> > buffer_map_t;
        typedef LLOctreeListener<LLDrawable>    BaseType;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 7c76634..3f02f6a 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -64,7 +64,7 @@
 #include "llsecondlifeurls.h"
 #include "llstring.h"
 #include "lluserrelations.h"
-#include "llversion.h"
+#include "llversionviewer.h"
 #include "llvfs.h"
 #include "llwindow.h"           // for shell_open
 #include "llxorcipher.h"        // saved password, MAC address
@@ -216,6 +216,9 @@ LLString gInitialOutfitGender;	// "male" or "female"
 static bool gUseCircuitCallbackCalled = false;
+S32 LLStartUp::gStartupState = STATE_FIRST;
 //
 // local function declaration
 //
@@ -356,7 +359,7 @@ BOOL idle_startup()
                gImageList.updateImages(0.01f);
        }
-        if (STATE_FIRST == gStartupState)
+        if ( STATE_FIRST == LLStartUp::getStartupState() )
        {
                gViewerWindow->showCursor();
                gViewerWindow->getWindow()->setCursor(UI_CURSOR_WAIT);
@@ -565,10 +568,7 @@ BOOL idle_startup()
 #endif // LL_LINUX
                std::ostringstream codec;
-                codec << "[Second Life ";
+                codec << "[Second Life " << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH << "." << LL_VERSION_BUILD << "]";
-                codec << "(" << gChannelName << ")";
-                codec << " - " << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH << "." << LL_VERSION_BUILD;
-                codec << "]";
                LLMozLib::getInstance()->setBrowserAgentId( codec.str() );
                #endif
@@ -608,67 +608,49 @@ BOOL idle_startup()
                        llwarns << "Unreliable timers detected (may be bad PCI chipset)!!" << llendl;
                }
-                // Get ready to show the login dialog
+                //
-                if (!gConnectToSomething)
+                // Log on to system
+                //
+                if( !gCmdLineFirstName.empty() 
+                        && !gCmdLineLastName.empty() 
+                        && !gCmdLinePassword.empty())
                {
-                        // Don't use a session token, and generate a random user id
+                        firstname = gCmdLineFirstName;
-                        gAgentID.generate();
+                        lastname = gCmdLineLastName;
-                        gAgentSessionID = LLUUID::null;
-                        gStartupState = STATE_WORLD_INIT;
+                        LLMD5 pass((unsigned char*)gCmdLinePassword.c_str());
-                        return do_normal_idle;
+                        char md5pass[33];               /* Flawfinder: ignore */
+                        pass.hex_digest(md5pass);
+                        password = md5pass;
+                        remember_password = gSavedSettings.getBOOL("RememberPassword");
+                        show_connect_box = FALSE;
                }
-                else if (!gRunLocal)
+                else if (gAutoLogin || gSavedSettings.getBOOL("AutoLogin"))
                {
-                        //
+                        firstname = gSavedSettings.getString("FirstName");
-                        // Log on to userserver
+                        lastname = gSavedSettings.getString("LastName");
-                        //
+                        password = load_password_from_disk();
-                        if( !gCmdLineFirstName.empty() 
+                        remember_password = TRUE;
-                                && !gCmdLineLastName.empty() 
+                        show_connect_box = FALSE;
-                                && !gCmdLinePassword.empty())
-                        {
-                                firstname = gCmdLineFirstName;
-                                lastname = gCmdLineLastName;
-                                LLMD5 pass((unsigned char*)gCmdLinePassword.c_str());
-                                char md5pass[33];               /* Flawfinder: ignore */
-                                pass.hex_digest(md5pass);
-                                password = md5pass;
-                                remember_password = gSavedSettings.getBOOL("RememberPassword");
-                                show_connect_box = FALSE;
-                        }
-                        else if (gAutoLogin || gSavedSettings.getBOOL("AutoLogin"))
-                        {
-                                firstname = gSavedSettings.getString("FirstName");
-                                lastname = gSavedSettings.getString("LastName");
-                                password = load_password_from_disk();
-                                remember_password = TRUE;
-                                show_connect_box = FALSE;
-                        }
-                        else
-                        {
-                                // if not automatically logging in, display login dialog
-                                // until a valid userserver is selected
-                                firstname = gSavedSettings.getString("FirstName");
-                                lastname = gSavedSettings.getString("LastName");
-                                password = load_password_from_disk();
-                                remember_password = gSavedSettings.getBOOL("RememberPassword");
-                                show_connect_box = TRUE;
-                        }
-                        // Go to the next startup state
-                        gStartupState++;
-                        return do_normal_idle;
                }
                else
                {
-                        gStartupState++;
+                        // if not automatically logging in, display login dialog
-                        return do_normal_idle;
+                        // until a valid userserver is selected
+                        firstname = gSavedSettings.getString("FirstName");
+                        lastname = gSavedSettings.getString("LastName");
+                        password = load_password_from_disk();
+                        remember_password = gSavedSettings.getBOOL("RememberPassword");
+                        show_connect_box = TRUE;
                }
+                // Go to the next startup state
+                LLStartUp::setStartupState( STATE_LOGIN_SHOW );
+                return do_normal_idle;
        }
-        if (STATE_LOGIN_SHOW == gStartupState)
+        if (STATE_LOGIN_SHOW == LLStartUp::getStartupState())
        {
                llinfos << "Initializing Window" << llendl;
                
@@ -678,45 +660,37 @@ BOOL idle_startup()
                timeout_count = 0;
-                if (gConnectToSomething && !gRunLocal)
+                if (show_connect_box)
                {
-                        if (show_connect_box)
+                        if (gNoRender)
                        {
-                                if (gNoRender)
+                                llerrs << "Need to autologin or use command line with norender!" << llendl;
-                                {
+                        }
-                                        llerrs << "Need to autologin or use command line with norender!" << llendl;
+                        // Make sure the process dialog doesn't hide things
-                                }
+                        gViewerWindow->setShowProgress(FALSE);
-                                // Make sure the process dialog doesn't hide things
-                                gViewerWindow->setShowProgress(FALSE);
-                                // Show the login dialog
+                        // Show the login dialog
-                                login_show();
+                        login_show();
-                                // connect dialog is already shown, so fill in the names
+                        // connect dialog is already shown, so fill in the names
-                                LLPanelLogin::setFields( firstname, lastname, password, remember_password );
+                        LLPanelLogin::setFields( firstname, lastname, password, remember_password );
-                                LLPanelLogin::giveFocus();
+                        LLPanelLogin::giveFocus();
-                                gSavedSettings.setBOOL("FirstRunThisInstall", FALSE);
+                        gSavedSettings.setBOOL("FirstRunThisInstall", FALSE);
-                                gStartupState++;
+                        LLStartUp::setStartupState( STATE_LOGIN_WAIT );         // Wait for user input
-                        }
-                        else
-                        {
-                                // skip directly to message template verification
-                                gStartupState = STATE_LOGIN_CLEANUP;
-                        }
                }
                else
                {
-                        gMessageSystem->setCircuitProtection(FALSE);
+                        // skip directly to message template verification
-                        gStartupState = STATE_LOGIN_CLEANUP;
+                        LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );
                }
                timeout.reset();
                return do_normal_idle;
        }
-        if (STATE_LOGIN_WAIT == gStartupState)
+        if (STATE_LOGIN_WAIT == LLStartUp::getStartupState())
        {
                // Don't do anything.  Wait for the login view to call the login_callback,
                // which will push us to the next state.
@@ -726,7 +700,7 @@ BOOL idle_startup()
                return do_normal_idle;
        }
-        if (STATE_LOGIN_CLEANUP == gStartupState)
+        if (STATE_LOGIN_CLEANUP == LLStartUp::getStartupState())
        {
                if (show_connect_box)
                {
@@ -794,7 +768,7 @@ BOOL idle_startup()
                {
                        LLString server_label;
                        S32 domain_name_index;
-                        LLPanelLogin::getServer( server_label, domain_name_index );
+                        BOOL user_picked_server = LLPanelLogin::getServer( server_label, domain_name_index );
                        gUserServerChoice = (EUserServerDomain) domain_name_index;
                        gSavedSettings.setS32("ServerChoice", gUserServerChoice);
                        if (gUserServerChoice == USERSERVER_OTHER)
@@ -802,14 +776,11 @@ BOOL idle_startup()
                                snprintf(gUserServerName, MAX_STRING, "%s", server_label.c_str());                      /* Flawfinder: ignore */
                        }
-                        // Dave S temp reversion of SL-49082 fix - this code breaks command line urls.  I'll fix this with
+                        if ( user_picked_server )
-                        // the control isDirty() functionality tomorrow.
+                        {       // User picked a grid from the popup, so clear the stored urls and they will be re-generated from gUserServerChoice
+                                auth_uris.clear();
-                        //if ( userPickedServer )
+                                resetURIs();
-                        //{     // User picked a grid from the popup, so clear the stored urls so they will be re-generated from gUserServerChoice
+                        }
-                        //      auth_uris.clear();
-                        //      resetURIs();
-                        //}
                        LLString location;
                        LLPanelLogin::getLocation( location );
@@ -872,18 +843,18 @@ BOOL idle_startup()
                init_colors();
                // skipping over STATE_UPDATE_CHECK because that just waits for input
-                gStartupState = STATE_LOGIN_AUTH_INIT;
+                LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );
                return do_normal_idle;
        }
-        if (STATE_UPDATE_CHECK == gStartupState)
+        if (STATE_UPDATE_CHECK == LLStartUp::getStartupState())
        {
                // wait for user to give input via dialog box
                return do_normal_idle;
        }
-        if(STATE_LOGIN_AUTH_INIT == gStartupState)
+        if(STATE_LOGIN_AUTH_INIT == LLStartUp::getStartupState())
        {
 //#define LL_MINIMIAL_REQUESTED_OPTIONS
                lldebugs << "STATE_LOGIN_AUTH_INIT" << llendl;
@@ -930,10 +901,10 @@ BOOL idle_startup()
                auth_desc = "Logging in.  ";
                auth_desc += gSecondLife;
                auth_desc += " may appear frozen.  Please wait.";
-                ++gStartupState;
+                LLStartUp::setStartupState( STATE_LOGIN_AUTHENTICATE );
        }
-        if (STATE_LOGIN_AUTHENTICATE == gStartupState)
+        if (STATE_LOGIN_AUTHENTICATE == LLStartUp::getStartupState())
        {
                lldebugs << "STATE_LOGIN_AUTHENTICATE" << llendl;
                set_startup_status(progress, auth_desc.c_str(), auth_message.c_str());
@@ -985,11 +956,11 @@ BOOL idle_startup()
                // reset globals
                gAcceptTOS = FALSE;
                gAcceptCriticalMessage = FALSE;
-                ++gStartupState;
+                LLStartUp::setStartupState( STATE_LOGIN_NO_DATA_YET );
                return do_normal_idle;
        }
-        if(STATE_LOGIN_NO_DATA_YET == gStartupState)
+        if(STATE_LOGIN_NO_DATA_YET == LLStartUp::getStartupState())
        {
                //lldebugs << "STATE_LOGIN_NO_DATA_YET" << llendl;
                if (!gUserAuthp)
@@ -1008,13 +979,13 @@ BOOL idle_startup()
                        //llinfos << "waiting..." << llendl;
                        return do_normal_idle;
                }
-                ++gStartupState;
+                LLStartUp::setStartupState( STATE_LOGIN_DOWNLOADING );
                progress += 0.01f;
                set_startup_status(progress, auth_desc.c_str(), auth_message.c_str());
                return do_normal_idle;
        }
-        if(STATE_LOGIN_DOWNLOADING == gStartupState)
+        if(STATE_LOGIN_DOWNLOADING == LLStartUp::getStartupState())
        {
                lldebugs << "STATE_LOGIN_DOWNLOADING" << llendl;
                if (!gUserAuthp)
@@ -1033,13 +1004,13 @@ BOOL idle_startup()
                        //llinfos << "downloading..." << llendl;
                        return do_normal_idle;
                }
-                ++gStartupState;
+                LLStartUp::setStartupState( STATE_LOGIN_PROCESS_RESPONSE );
                progress += 0.01f;
                set_startup_status(progress, "Processing Response...", auth_message.c_str());
                return do_normal_idle;
        }
-        if(STATE_LOGIN_PROCESS_RESPONSE == gStartupState)
+        if(STATE_LOGIN_PROCESS_RESPONSE == LLStartUp::getStartupState())
        {
                lldebugs << "STATE_LOGIN_PROCESS_RESPONSE" << llendl;
                std::ostringstream emsg;
@@ -1078,7 +1049,7 @@ BOOL idle_startup()
                                }
                                // ignoring the duration & options array for now.
                                // Go back to authenticate.
-                                gStartupState = STATE_LOGIN_AUTHENTICATE;
+                                LLStartUp::setStartupState( STATE_LOGIN_AUTHENTICATE );
                                return do_normal_idle;
                        }
                        else
@@ -1101,7 +1072,7 @@ BOOL idle_startup()
                                        if (show_connect_box)
                                        {
                                                llinfos << "Need tos agreement" << llendl;
-                                                gStartupState = STATE_UPDATE_CHECK;
+                                                LLStartUp::setStartupState( STATE_UPDATE_CHECK );
                                                LLFloaterTOS* tos_dialog = LLFloaterTOS::show(LLFloaterTOS::TOS_TOS,
                                                                                                                                        message_response);
                                                tos_dialog->startModal();
@@ -1118,7 +1089,7 @@ BOOL idle_startup()
                                        if (show_connect_box)
                                        {
                                                llinfos << "Need critical message" << llendl;
-                                                gStartupState = STATE_UPDATE_CHECK;
+                                                LLStartUp::setStartupState( STATE_UPDATE_CHECK );
                                                LLFloaterTOS* tos_dialog = LLFloaterTOS::show(LLFloaterTOS::TOS_CRITICAL_MESSAGE,
                                                                                                                                        message_response);
                                                tos_dialog->startModal();
@@ -1142,7 +1113,7 @@ BOOL idle_startup()
                                        if (show_connect_box)
                                        {
                                                update_app(TRUE, auth_message);
-                                                gStartupState = STATE_UPDATE_CHECK;
+                                                LLStartUp::setStartupState( STATE_UPDATE_CHECK );
                                                return FALSE;
                                        }
                                        else
@@ -1157,7 +1128,7 @@ BOOL idle_startup()
                                        if (show_connect_box)
                                        {
                                                update_app(FALSE, auth_message);
-                                                gStartupState = STATE_UPDATE_CHECK;
+                                                LLStartUp::setStartupState( STATE_UPDATE_CHECK );
                                                gSkipOptionalUpdate = TRUE;
                                                return FALSE;
                                        }
@@ -1180,7 +1151,7 @@ BOOL idle_startup()
                                s << "Previous login attempt failed. Logging in, attempt "
                                  << (auth_uri_num + 1) << ".  ";
                                auth_desc = s.str();
-                                gStartupState = STATE_LOGIN_AUTHENTICATE;
+                                LLStartUp::setStartupState( STATE_LOGIN_AUTHENTICATE );
                                auth_uri_num++;
                                return do_normal_idle;
                        }
@@ -1410,7 +1381,7 @@ BOOL idle_startup()
                           && first_sim.isOk()
                           && gAgent.mInventoryRootID.notNull())
                        {
-                                ++gStartupState;
+                                LLStartUp::setStartupState( STATE_WORLD_INIT );
                        }
                        else
                        {
@@ -1454,7 +1425,7 @@ BOOL idle_startup()
        //---------------------------------------------------------------------
        // World Init
        //---------------------------------------------------------------------
-        if (STATE_WORLD_INIT == gStartupState)
+        if (STATE_WORLD_INIT == LLStartUp::getStartupState())
        {
                set_startup_status(0.40f, "Initializing World...", gAgent.mMOTD.c_str());
                display_startup();
@@ -1497,38 +1468,26 @@ BOOL idle_startup()
                // User might have overridden far clip
                gWorldp->setLandFarClip( gAgent.mDrawDistance );
-                if (!gRunLocal)
+                // Before we create the first region, we need to set the agent's mOriginGlobal
-                {
+                // This is necessary because creating objects before this is set will result in a
-                        // Before we create the first region, we need to set the agent's mOriginGlobal
+                // bad mPositionAgent cache.
-                        // This is necessary because creating objects before this is set will result in a
-                        // bad mPositionAgent cache.
-                        gAgent.initOriginGlobal(from_region_handle(first_sim_handle));
+                gAgent.initOriginGlobal(from_region_handle(first_sim_handle));
-                        gWorldp->addRegion(first_sim_handle, first_sim);
+                gWorldp->addRegion(first_sim_handle, first_sim);
-                        LLViewerRegion *regionp = gWorldp->getRegionFromHandle(first_sim_handle);
+                LLViewerRegion *regionp = gWorldp->getRegionFromHandle(first_sim_handle);
-                        llinfos << "Adding initial simulator " << regionp->getOriginGlobal() << llendl;
+                llinfos << "Adding initial simulator " << regionp->getOriginGlobal() << llendl;
-                        
+                
-                        gStartupState = STATE_SEED_GRANTED_WAIT;
+                LLStartUp::setStartupState( STATE_SEED_GRANTED_WAIT );
-                        regionp->setSeedCapability(first_sim_seed_cap);
+                regionp->setSeedCapability(first_sim_seed_cap);
-                        
+                
-                        // Set agent's initial region to be the one we just created.
+                // Set agent's initial region to be the one we just created.
-                        gAgent.setRegion(regionp);
+                gAgent.setRegion(regionp);
-                        // Set agent's initial position, which will be read by LLVOAvatar when the avatar
+                // Set agent's initial position, which will be read by LLVOAvatar when the avatar
-                        // object is created.  I think this must be done after setting the region.  JC
+                // object is created.  I think this must be done after setting the region.  JC
-                        gAgent.setPositionAgent(agent_start_position_region);
+                gAgent.setPositionAgent(agent_start_position_region);
-                }
-                else
-                {
-                        // With one simulator, assume region is at 0,0, hence has regionHandle 0
-                        // VEFFECT: Login
-                        gWorldp->addRegion(0, gAgentSimHost);
-                        gAgent.setRegion(gWorldp->getRegionFromHandle(0));
-                        
-                        gStartupState = STATE_SEED_CAP_GRANTED;
-                }
                display_startup();
                return do_normal_idle;
@@ -1538,7 +1497,7 @@ BOOL idle_startup()
        //---------------------------------------------------------------------
        // Wait for Seed Cap Grant
        //---------------------------------------------------------------------
-        if(STATE_SEED_GRANTED_WAIT == gStartupState)
+        if(STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
        {
                llinfos << "Waiting for seed grant ...." << llendl;
                return do_normal_idle;
@@ -1549,7 +1508,7 @@ BOOL idle_startup()
        // Seed Capability Granted
        // no newMessage calls should happen before this point
        //---------------------------------------------------------------------
-        if (STATE_SEED_CAP_GRANTED == gStartupState)
+        if (STATE_SEED_CAP_GRANTED == LLStartUp::getStartupState())
        {
                update_texture_fetch();
@@ -1682,42 +1641,35 @@ BOOL idle_startup()
                // For all images pre-loaded into viewer cache, decode them.
                // Need to do this AFTER we init the sky
                gImageList.decodeAllImages(2.f);
-                gStartupState++;
+                LLStartUp::setStartupState( STATE_QUICKTIME_INIT );
                // JC - Do this as late as possible to increase likelihood Purify
                // will run.
-                if (!gRunLocal)
+                LLMessageSystem* msg = gMessageSystem;
+                if (!msg->mOurCircuitCode)
                {
-                        LLMessageSystem* msg = gMessageSystem;
+                        llwarns << "Attempting to connect to simulator with a zero circuit code!" << llendl;
-                        if (!msg->mOurCircuitCode)
-                        {
-                                llwarns << "Attempting to connect to simulator with a zero circuit code!" << llendl;
-                        }
-                        gUseCircuitCallbackCalled = FALSE;
-                        msg->enableCircuit(first_sim, TRUE);
-                        // now, use the circuit info to tell simulator about us!
-                        llinfos << "viewer: UserLoginLocationReply() Enabling " << first_sim << " with code " << msg->mOurCircuitCode << llendl;
-                        msg->newMessageFast(_PREHASH_UseCircuitCode);
-                        msg->nextBlockFast(_PREHASH_CircuitCode);
-                        msg->addU32Fast(_PREHASH_Code, msg->mOurCircuitCode);
-                        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                        msg->addUUIDFast(_PREHASH_ID, gAgent.getID());
-                        msg->sendReliable(
-                                first_sim,
-                                MAX_TIMEOUT_COUNT,
-                                FALSE,
-                                TIMEOUT_SECONDS,
-                                use_circuit_callback,
-                                NULL);
                }
+                gUseCircuitCallbackCalled = FALSE;
+                msg->enableCircuit(first_sim, TRUE);
+                // now, use the circuit info to tell simulator about us!
+                llinfos << "viewer: UserLoginLocationReply() Enabling " << first_sim << " with code " << msg->mOurCircuitCode << llendl;
+                msg->newMessageFast(_PREHASH_UseCircuitCode);
+                msg->nextBlockFast(_PREHASH_CircuitCode);
+                msg->addU32Fast(_PREHASH_Code, msg->mOurCircuitCode);
+                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                msg->addUUIDFast(_PREHASH_ID, gAgent.getID());
+                msg->sendReliable(
+                        first_sim,
+                        MAX_TIMEOUT_COUNT,
+                        FALSE,
+                        TIMEOUT_SECONDS,
+                        use_circuit_callback,
+                        NULL);
                timeout.reset();
-                if (!gConnectToSomething)
-                {
-                        gStartupState = STATE_MISC;
-                }
                return do_normal_idle;
        }
@@ -1725,7 +1677,7 @@ BOOL idle_startup()
        //---------------------------------------------------------------------
        // LLMediaEngine Init
        //---------------------------------------------------------------------
-        if (STATE_QUICKTIME_INIT == gStartupState)
+        if (STATE_QUICKTIME_INIT == LLStartUp::getStartupState())
        {
                if (gViewerWindow)
                {
@@ -1760,20 +1712,20 @@ BOOL idle_startup()
                }
                #endif
-                gStartupState++;
+                LLStartUp::setStartupState( STATE_WORLD_WAIT );
                return do_normal_idle;
        }
        //---------------------------------------------------------------------
        // Agent Send
        //---------------------------------------------------------------------
-        if(STATE_WORLD_WAIT == gStartupState)
+        if(STATE_WORLD_WAIT == LLStartUp::getStartupState())
        {
                //llinfos << "Waiting for simulator ack...." << llendl;
                set_startup_status(0.49f, "Waiting for region handshake...", gAgent.mMOTD.c_str());
                if(gGotUseCircuitCodeAck)
                {
-                        ++gStartupState;
+                        LLStartUp::setStartupState( STATE_AGENT_SEND );
                }
                LLMessageSystem* msg = gMessageSystem;
                while (msg->checkAllMessages(gFrameCount, gServicePump))
@@ -1786,7 +1738,7 @@ BOOL idle_startup()
        //---------------------------------------------------------------------
        // Agent Send
        //---------------------------------------------------------------------
-        if (STATE_AGENT_SEND == gStartupState)
+        if (STATE_AGENT_SEND == LLStartUp::getStartupState())
        {
                llinfos << "Connecting to region..." << llendl;
                set_startup_status(0.50f, "Connecting to region...", gAgent.mMOTD.c_str());
@@ -1797,7 +1749,7 @@ BOOL idle_startup()
                        _PREHASH_AgentMovementComplete,
                        process_agent_movement_complete);
                LLViewerRegion* regionp = gAgent.getRegion();
-                if(!gRunLocal && regionp)
+                if(regionp)
                {
                        send_complete_agent_movement(regionp->getHost());
                        gAssetStorage->setUpstream(regionp->getHost());
@@ -1805,10 +1757,6 @@ BOOL idle_startup()
                        msg->newMessageFast(_PREHASH_EconomyDataRequest);
                        gAgent.sendReliableMessage();
                }
-                else
-                {
-                        gStartupState++;
-                }
                // Create login effect
                // But not on first login, because you can't see your avatar then
@@ -1820,7 +1768,7 @@ BOOL idle_startup()
                        gHUDManager->sendEffects();
                }
-                gStartupState++;
+                LLStartUp::setStartupState( STATE_AGENT_WAIT );         // Go to STATE_AGENT_WAIT
                timeout.reset();
                return do_normal_idle;
@@ -1829,14 +1777,13 @@ BOOL idle_startup()
        //---------------------------------------------------------------------
        // Agent Wait
        //---------------------------------------------------------------------
-        if (STATE_AGENT_WAIT == gStartupState)
+        if (STATE_AGENT_WAIT == LLStartUp::getStartupState())
        {
                LLMessageSystem* msg = gMessageSystem;
                while (msg->checkAllMessages(gFrameCount, gServicePump))
                {
                        if (gAgentMovementCompleted)
                        {
-                                gStartupState++;
                                // Sometimes we have more than one message in the
                                // queue. break out of this loop and continue
                                // processing. If we don't, then this could skip one
@@ -1850,183 +1797,187 @@ BOOL idle_startup()
                        }
                }
                msg->processAcks();
+                if (gAgentMovementCompleted)
+                {
+                        LLStartUp::setStartupState( STATE_INVENTORY_SEND );
+                }
                return do_normal_idle;
        }
        //---------------------------------------------------------------------
        // Inventory Send
        //---------------------------------------------------------------------
-        if (STATE_INVENTORY_SEND == gStartupState)
+        if (STATE_INVENTORY_SEND == LLStartUp::getStartupState())
        {
                if (!gUserAuthp)
                {
                        llerrs << "No userauth in STATE_INVENTORY_SEND!" << llendl;
                }
-                if (gConnectToSomething && !gRunLocal)
+                // unpack thin inventory
+                LLUserAuth::options_t options;
+                options.clear();
+                //bool dump_buffer = false;
+                
+                if(gUserAuthp->getOptions("inventory-lib-root", options)
+                        && !options.empty())
                {
-                        // unpack thin inventory
+                        // should only be one
-                        LLUserAuth::options_t options;
+                        LLUserAuth::response_t::iterator it;
-                        options.clear();
+                        it = options[0].find("folder_id");
-                        //bool dump_buffer = false;
+                        if(it != options[0].end())
-                        
-                        if(gUserAuthp->getOptions("inventory-lib-root", options)
-                           && !options.empty())
                        {
-                                // should only be one
+                                gInventoryLibraryRoot.set((*it).second.c_str());
-                                LLUserAuth::response_t::iterator it;
-                                it = options[0].find("folder_id");
-                                if(it != options[0].end())
-                                {
-                                        gInventoryLibraryRoot.set((*it).second.c_str());
-                                }
                        }
-                        options.clear();
+                }
-                        if(gUserAuthp->getOptions("inventory-lib-owner", options)
+                options.clear();
-                           && !options.empty())
+                if(gUserAuthp->getOptions("inventory-lib-owner", options)
+                        && !options.empty())
+                {
+                        // should only be one
+                        LLUserAuth::response_t::iterator it;
+                        it = options[0].find("agent_id");
+                        if(it != options[0].end())
                        {
-                                // should only be one
+                                gInventoryLibraryOwner.set((*it).second.c_str());
-                                LLUserAuth::response_t::iterator it;
-                                it = options[0].find("agent_id");
-                                if(it != options[0].end())
-                                {
-                                        gInventoryLibraryOwner.set((*it).second.c_str());
-                                }
                        }
-                        options.clear();
+                }
-                        if(gUserAuthp->getOptions("inventory-skel-lib", options)
+                options.clear();
-                           && gInventoryLibraryOwner.notNull())
+                if(gUserAuthp->getOptions("inventory-skel-lib", options)
+                        && gInventoryLibraryOwner.notNull())
+                {
+                        if(!gInventory.loadSkeleton(options, gInventoryLibraryOwner))
                        {
-                                if(!gInventory.loadSkeleton(options, gInventoryLibraryOwner))
+                                llwarns << "Problem loading inventory-skel-lib" << llendl;
-                                {
-                                        llwarns << "Problem loading inventory-skel-lib" << llendl;
-                                }
                        }
-                        options.clear();
+                }
-                        if(gUserAuthp->getOptions("inventory-skeleton", options))
+                options.clear();
+                if(gUserAuthp->getOptions("inventory-skeleton", options))
+                {
+                        if(!gInventory.loadSkeleton(options, gAgent.getID()))
                        {
-                                if(!gInventory.loadSkeleton(options, gAgent.getID()))
+                                llwarns << "Problem loading inventory-skel-targets"
-                                {
+                                                << llendl;
-                                        llwarns << "Problem loading inventory-skel-targets"
-                                                        << llendl;
-                                }
                        }
+                }
-                        options.clear();
-                        if(gUserAuthp->getOptions("buddy-list", options))
+                options.clear();
-                        {
+                if(gUserAuthp->getOptions("buddy-list", options))
-                                LLUserAuth::options_t::iterator it = options.begin();
+                {
-                                LLUserAuth::options_t::iterator end = options.end();
+                        LLUserAuth::options_t::iterator it = options.begin();
-                                LLAvatarTracker::buddy_map_t list;
+                        LLUserAuth::options_t::iterator end = options.end();
-                                LLUUID agent_id;
+                        LLAvatarTracker::buddy_map_t list;
-                                S32 has_rights = 0, given_rights = 0;
+                        LLUUID agent_id;
-                                for (; it != end; ++it)
+                        S32 has_rights = 0, given_rights = 0;
+                        for (; it != end; ++it)
+                        {
+                                LLUserAuth::response_t::const_iterator option_it;
+                                option_it = (*it).find("buddy_id");
+                                if(option_it != (*it).end())
                                {
-                                        LLUserAuth::response_t::const_iterator option_it;
+                                        agent_id.set((*option_it).second.c_str());
-                                        option_it = (*it).find("buddy_id");
-                                        if(option_it != (*it).end())
-                                        {
-                                                agent_id.set((*option_it).second.c_str());
-                                        }
-                                        option_it = (*it).find("buddy_rights_has");
-                                        if(option_it != (*it).end())
-                                        {
-                                                has_rights = atoi((*option_it).second.c_str());
-                                        }
-                                        option_it = (*it).find("buddy_rights_given");
-                                        if(option_it != (*it).end())
-                                        {
-                                                given_rights = atoi((*option_it).second.c_str());
-                                        }
-                                        list[agent_id] = new LLRelationship(given_rights, has_rights, false);
                                }
-                                LLAvatarTracker::instance().addBuddyList(list);
+                                option_it = (*it).find("buddy_rights_has");
-                        }
+                                if(option_it != (*it).end())
-                        options.clear();
-                        if(gUserAuthp->getOptions("ui-config", options))
-                        {
-                                LLUserAuth::options_t::iterator it = options.begin();
-                                LLUserAuth::options_t::iterator end = options.end();
-                                for (; it != end; ++it)
                                {
-                                        LLUserAuth::response_t::const_iterator option_it;
+                                        has_rights = atoi((*option_it).second.c_str());
-                                        option_it = (*it).find("allow_first_life");
-                                        if(option_it != (*it).end())
-                                        {
-                                                if (option_it->second == "Y")
-                                                {
-                                                        LLPanelAvatar::sAllowFirstLife = TRUE;
-                                                }
-                                        }
                                }
-                        }
+                                option_it = (*it).find("buddy_rights_given");
+                                if(option_it != (*it).end())
-                        options.clear();
+                                {
-                        if(gUserAuthp->getOptions("event_categories", options))
+                                        given_rights = atoi((*option_it).second.c_str());
-                        {
+                                }
-                                LLEventInfo::loadCategories(options);
+                                list[agent_id] = new LLRelationship(given_rights, has_rights, false);
-                        }
-                        if(gUserAuthp->getOptions("event_notifications", options))
-                        {
-                                gEventNotifier.load(options);
                        }
-                        options.clear();
+                        LLAvatarTracker::instance().addBuddyList(list);
-                        if(gUserAuthp->getOptions("classified_categories", options))
+                }
+                options.clear();
+                if(gUserAuthp->getOptions("ui-config", options))
+                {
+                        LLUserAuth::options_t::iterator it = options.begin();
+                        LLUserAuth::options_t::iterator end = options.end();
+                        for (; it != end; ++it)
                        {
-                                LLClassifiedInfo::loadCategories(options);
+                                LLUserAuth::response_t::const_iterator option_it;
+                                option_it = (*it).find("allow_first_life");
+                                if(option_it != (*it).end())
+                                {
+                                        if (option_it->second == "Y")
+                                        {
+                                                LLPanelAvatar::sAllowFirstLife = TRUE;
+                                        }
+                                }
                        }
-                        gInventory.buildParentChildMap();
+                }
-                        gInventory.addChangedMask(LLInventoryObserver::ALL, LLUUID::null);
-                        gInventory.notifyObservers();
-                        // set up callbacks
+                options.clear();
-                        LLMessageSystem* msg = gMessageSystem;
+                if(gUserAuthp->getOptions("event_categories", options))
-                        LLInventoryModel::registerCallbacks(msg);
+                {
-                        LLAvatarTracker::instance().registerCallbacks(msg);
+                        LLEventInfo::loadCategories(options);
-                        LLLandmark::registerCallbacks(msg);
+                }
+                if(gUserAuthp->getOptions("event_notifications", options))
-                        // request mute list
+                {
-                        gMuteListp->requestFromServer(gAgent.getID());
+                        gEventNotifier.load(options);
+                }
-                        // Get L$ and ownership credit information
+                options.clear();
-                        msg->newMessageFast(_PREHASH_MoneyBalanceRequest);
+                if(gUserAuthp->getOptions("classified_categories", options))
-                        msg->nextBlockFast(_PREHASH_AgentData);
+                {
-                        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                        LLClassifiedInfo::loadCategories(options);
-                        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                }
-                        msg->nextBlockFast(_PREHASH_MoneyData);
+                gInventory.buildParentChildMap();
-                        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null );
+                gInventory.addChangedMask(LLInventoryObserver::ALL, LLUUID::null);
-                        gAgent.sendReliableMessage();
+                gInventory.notifyObservers();
-                        // request all group information
+                // set up callbacks
-                        // *FIX: This will not do the right thing if the message
+                LLMessageSystem* msg = gMessageSystem;
-                        // gets there before the requestuserserverconnection
+                LLInventoryModel::registerCallbacks(msg);
-                        // circuit is completed.
+                LLAvatarTracker::instance().registerCallbacks(msg);
-                        gAgent.sendAgentDataUpdateRequest();
+                LLLandmark::registerCallbacks(msg);
+                // request mute list
+                gMuteListp->requestFromServer(gAgent.getID());
-                        // NOTE: removed as part of user-privacy
+                // Get L$ and ownership credit information
-                        // enhancements. this information should be available from
+                msg->newMessageFast(_PREHASH_MoneyBalanceRequest);
-                        // login. 2006-10-16 Phoenix.
+                msg->nextBlockFast(_PREHASH_AgentData);
-                        // get the users that have been granted modify powers
+                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-                        //msg->newMessageFast(_PREHASH_RequestGrantedProxies);
+                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                        //msg->nextBlockFast(_PREHASH_AgentData);
+                msg->nextBlockFast(_PREHASH_MoneyData);
-                        //msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null );
-                        //msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                gAgent.sendReliableMessage();
-                        //gAgent.sendReliableMessage();
-                        BOOL shown_at_exit = gSavedSettings.getBOOL("ShowInventory");
+                // request all group information
+                // *FIX: This will not do the right thing if the message
+                // gets there before the requestuserserverconnection
+                // circuit is completed.
+                gAgent.sendAgentDataUpdateRequest();
-                        // Create the inventory views
-                        LLInventoryView::showAgentInventory();
-                        // Hide the inventory if it wasn't shown at exit
+                // NOTE: removed as part of user-privacy
-                        if(!shown_at_exit)
+                // enhancements. this information should be available from
-                        {
+                // login. 2006-10-16 Phoenix.
-                                LLInventoryView::toggleVisibility(NULL);
+                // get the users that have been granted modify powers
-                        }
+                //msg->newMessageFast(_PREHASH_RequestGrantedProxies);
+                //msg->nextBlockFast(_PREHASH_AgentData);
+                //msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                //msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                //gAgent.sendReliableMessage();
+                BOOL shown_at_exit = gSavedSettings.getBOOL("ShowInventory");
+                // Create the inventory views
+                LLInventoryView::showAgentInventory();
+                // Hide the inventory if it wasn't shown at exit
+                if(!shown_at_exit)
+                {
+                        LLInventoryView::toggleVisibility(NULL);
                }
-                gStartupState++;
+                LLStartUp::setStartupState( STATE_MISC );
                return do_normal_idle;
        }
@@ -2034,14 +1985,8 @@ BOOL idle_startup()
        //---------------------------------------------------------------------
        // Misc
        //---------------------------------------------------------------------
-        if (STATE_MISC == gStartupState)
+        if (STATE_MISC == LLStartUp::getStartupState())
        {
-                // Create a few objects if we don't actually have a world
-                if (!gConnectToSomething)
-                {
-                        // could add them here
-                }
                // We have a region, and just did a big inventory download.
                // We can estimate the user's connection speed, and set their
                // max bandwidth accordingly.  JC
@@ -2060,7 +2005,7 @@ BOOL idle_startup()
                        {
                                llinfos << "Fast network connection, increasing max bandwidth to " 
                                        << FASTER_RATE_BPS/1024.f 
-                                        << " Kbps" << llendl;
+                                        << " kbps" << llendl;
                                gViewerThrottle.setMaxBandwidth(FASTER_RATE_BPS / 1024.f);
                        }
                        else if (rate_bps > FAST_RATE_BPS
@@ -2068,7 +2013,7 @@ BOOL idle_startup()
                        {
                                llinfos << "Fast network connection, increasing max bandwidth to " 
                                        << FAST_RATE_BPS/1024.f 
-                                        << " Kbps" << llendl;
+                                        << " kbps" << llendl;
                                gViewerThrottle.setMaxBandwidth(FAST_RATE_BPS / 1024.f);
                        }
                }
@@ -2220,12 +2165,12 @@ BOOL idle_startup()
                        }
                }
-                gStartupState++;
+                LLStartUp::setStartupState( STATE_PRECACHE );
                timeout.reset();
                return do_normal_idle;
        }
-        if (STATE_PRECACHE == gStartupState)
+        if (STATE_PRECACHE == LLStartUp::getStartupState())
        {
                do_normal_idle = TRUE;
                
@@ -2234,7 +2179,7 @@ BOOL idle_startup()
                if(((timeout_frac > 1.f) && gAgent.getAvatarObject())
                   || (timeout_frac > 3.f))
                {
-                        gStartupState++;
+                        LLStartUp::setStartupState( STATE_WEARABLES_WAIT );
                }
                else
                {
@@ -2246,7 +2191,7 @@ BOOL idle_startup()
                return do_normal_idle;
        }
-        if (STATE_WEARABLES_WAIT == gStartupState)
+        if (STATE_WEARABLES_WAIT == LLStartUp::getStartupState())
        {
                do_normal_idle = TRUE;
@@ -2257,13 +2202,13 @@ BOOL idle_startup()
                if(gAgent.getWearablesLoaded() || !gAgent.isGenderChosen())
                {
-                        gStartupState++;
+                        LLStartUp::setStartupState( STATE_CLEANUP );
                }
                else if (wearables_time > MAX_WEARABLES_TIME)
                {
                        gViewerWindow->alertXml("ClothingLoading");
                        gViewerStats->incStat(LLViewerStats::ST_WEARABLES_TOO_LONG);
-                        gStartupState++;
+                        LLStartUp::setStartupState( STATE_CLEANUP );
                }
                else
                {
@@ -2275,7 +2220,7 @@ BOOL idle_startup()
                return do_normal_idle;
        }
-        if (STATE_CLEANUP == gStartupState)
+        if (STATE_CLEANUP == LLStartUp::getStartupState())
        {
                set_startup_status(1.0, "", NULL);
@@ -2347,7 +2292,7 @@ BOOL idle_startup()
                        gUserAuthp = NULL;
                }
-                gStartupState++;
+                LLStartUp::setStartupState( STATE_STARTED );
                // Unmute audio if desired and setup volumes
                audio_update_volume();
@@ -2361,7 +2306,7 @@ BOOL idle_startup()
                return do_normal_idle;
        }
-        llwarns << "Reached end of idle_startup for state " << gStartupState << llendl;
+        llwarns << "Reached end of idle_startup for state " << LLStartUp::getStartupState() << llendl;
        return do_normal_idle;
 }
@@ -2421,7 +2366,7 @@ void login_callback(S32 option, void *userdata)
        if (CONNECT_OPTION == option)
        {
-                gStartupState++;
+                LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );
                return;
        }
        else if (QUIT_OPTION == option)
@@ -2688,7 +2633,7 @@ void update_dialog_callback(S32 option, void *userdata)
 #if !LL_RELEASE_FOR_DOWNLOAD
        if (option == 2)
        {
-                gStartupState++;
+                LLStartUp::setStartupState( STATE_WORLD_INIT ); 
                return;
        }
 #endif
@@ -2704,7 +2649,7 @@ void update_dialog_callback(S32 option, void *userdata)
                }
                else
                {
-                        gStartupState++;
+                        LLStartUp::setStartupState( STATE_WORLD_INIT );
                }
                return;
        }
@@ -3089,7 +3034,7 @@ void init_stat_view()
        stat_barp->mDisplayHistory = FALSE;
        stat_barp = stat_viewp->addStat("Packet Loss", &(gViewerStats->mPacketsLostPercentStat));
-        stat_barp->setUnitLabel(" %%");
+        stat_barp->setUnitLabel(" %");
        stat_barp->mMinBar = 0.f;
        stat_barp->mMaxBar = 5.f;
        stat_barp->mTickSpacing = 1.f;
@@ -3109,16 +3054,6 @@ void init_stat_view()
        stat_barp->mPerSec = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = stat_viewp->addStat("Ping User", &(gViewerStats->mUserserverPingStat));
-        stat_barp->setUnitLabel(" msec");
-        stat_barp->mMinBar = 0.f;
-        stat_barp->mMaxBar = 1000.f;
-        stat_barp->mTickSpacing = 100.f;
-        stat_barp->mLabelSpacing = 200.f;
-        stat_barp->mDisplayBar = FALSE;
-        stat_barp->mPerSec = FALSE;
-        stat_barp->mDisplayMean = FALSE;
        stat_viewp = new LLStatView("advanced stat view", "Advanced", "OpenDebugStatAdvanced", rect);
        gDebugView->mStatViewp->addChildAtEnd(stat_viewp);
@@ -3740,17 +3675,31 @@ void release_start_screen()
        gStartImageGL = NULL;
 }
+// static
 bool LLStartUp::canGoFullscreen()
 {
-        return gStartupState >= STATE_WORLD_INIT;
+        return LLStartUp::getStartupState() >= STATE_WORLD_INIT;
 }
+// static
+void LLStartUp::setStartupState( S32 state )
+{
+        llinfos << "Startup state changing from " << gStartupState << " to " << state << llendl;
+        gStartupState = state;
+}
 void reset_login()
 {
-        gStartupState = STATE_LOGIN_SHOW;
+        LLStartUp::setStartupState( STATE_LOGIN_SHOW );
        if ( gViewerWindow )
        {       // Hide menus and normal buttons
                gViewerWindow->setNormalControlsVisible( FALSE );
        }
+        // Hide any other stuff
+        if ( gFloaterMap )
+                gFloaterMap->setVisible( FALSE );
 }
diff --git a/linden/indra/newview/llstartup.h b/linden/indra/newview/llstartup.h
index 718d74d..d9adc62 100644
--- a/linden/indra/newview/llstartup.h
+++ b/linden/indra/newview/llstartup.h
@@ -42,38 +42,32 @@ extern const char* SCREEN_HOME_FILENAME;
 extern const char* SCREEN_LAST_FILENAME;
 enum EStartupState{
-        STATE_FIRST,
+        STATE_FIRST,                                    // Initial startup
-        STATE_LOGIN_SHOW,
+        STATE_LOGIN_SHOW,                               // Show login screen
-        STATE_LOGIN_WAIT,
+        STATE_LOGIN_WAIT,                               // Wait for user input at login screen
-        STATE_LOGIN_CLEANUP,
+        STATE_LOGIN_CLEANUP,                    // Get rid of login screen and start login
-        STATE_UPDATE_CHECK,
+        STATE_UPDATE_CHECK,                             // Wait for user at a dialog box (updates, term-of-service, etc)
-        STATE_LOGIN_AUTH_INIT,
+        STATE_LOGIN_AUTH_INIT,                  // Start login to SL servers
-        STATE_LOGIN_AUTHENTICATE,
+        STATE_LOGIN_AUTHENTICATE,               // Do authentication voodoo
-        STATE_LOGIN_NO_DATA_YET,
+        STATE_LOGIN_NO_DATA_YET,                // Waiting for authentication replies to start
-        STATE_LOGIN_DOWNLOADING,
+        STATE_LOGIN_DOWNLOADING,                // Waiting for authentication replies to download
-        STATE_LOGIN_PROCESS_RESPONSE,
+        STATE_LOGIN_PROCESS_RESPONSE,   // Check authentication reply
-        STATE_WORLD_INIT,
+        STATE_WORLD_INIT,                               // Start building the world
-        STATE_SEED_GRANTED_WAIT,
+        STATE_SEED_GRANTED_WAIT,                // Wait for seed cap grant
-        STATE_SEED_CAP_GRANTED,
+        STATE_SEED_CAP_GRANTED,                 // Have seed cap grant 
-        STATE_QUICKTIME_INIT,
+        STATE_QUICKTIME_INIT,                   // Initialzie QT
-        STATE_WORLD_WAIT,
+        STATE_WORLD_WAIT,                               // Waiting for simulator
-        STATE_AGENT_SEND,
+        STATE_AGENT_SEND,                               // Connect to a region
-        STATE_AGENT_WAIT,
+        STATE_AGENT_WAIT,                               // Wait for region
-        STATE_INVENTORY_SEND,
+        STATE_INVENTORY_SEND,                   // Do inventory transfer
-        STATE_MISC,
+        STATE_MISC,                                             // Do more things (set bandwidth, start audio, save location, etc)
-        STATE_PRECACHE,
+        STATE_PRECACHE,                                 // Wait a bit for textures to download
-        STATE_WEARABLES_WAIT,
+        STATE_WEARABLES_WAIT,                   // Wait for clothing to download
-        //STATE_INVENTORY_WAIT,
+        STATE_CLEANUP,                                  // Final cleanup
-        //STATE_TOS_AGREEMENT_START,
+        STATE_STARTED                                   // Up and running in-world
-        //STATE_TOS_AGREEMENT_WAIT,
-        //STATE_CRITICAL_MESSAGE_START,
-        //STATE_CRITICAL_MESSAGE_WAIT,
-        STATE_CLEANUP,
-        STATE_STARTED
 };
-// exorted symbol
+// exported symbols
-extern S32 gStartupState;
 extern BOOL gAgentMovementCompleted;
 extern bool gUseQuickTime;
 extern bool gQuickTimeInitialized;
@@ -85,6 +79,13 @@ public:
        static bool canGoFullscreen();
                // returns true if we are far enough along in startup to allow
                // going full screen
+        // Always use this to set gStartupState so changes are logged
+        static void     setStartupState( S32 state );
+        static S32      getStartupState()                               { return gStartupState;         };
+protected:
+        static S32 gStartupState;                       // Do not set directly, use LLStartup::setStartupState
 };
diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp
index 9d6434f..2471e18 100644
--- a/linden/indra/newview/llstatusbar.cpp
+++ b/linden/indra/newview/llstatusbar.cpp
@@ -157,7 +157,7 @@ LLStatusBar::LLStatusBar(const std::string& name, const LLRect& rect)
        LLString text = childGetText("bandwidth_tooltip") + " ";
        LLUIString bandwidth_tooltip = text;    // get the text from XML until this widget is XML driven
        mSGBandwidth->setLabel(bandwidth_tooltip.getString().c_str());
-        mSGBandwidth->setUnits("Kbps");
+        mSGBandwidth->setUnits("kbps");
        mSGBandwidth->setPrecision(0);
        addChild(mSGBandwidth);
        x -= SIM_STAT_WIDTH + 2;
diff --git a/linden/indra/newview/lltexlayer.cpp b/linden/indra/newview/lltexlayer.cpp
index 2005e39..3b48d8b 100644
--- a/linden/indra/newview/lltexlayer.cpp
+++ b/linden/indra/newview/lltexlayer.cpp
@@ -482,7 +482,7 @@ void LLTexLayerSetBuffer::readBackAndUpload(U8* baked_bump_data)
 // static
-void LLTexLayerSetBuffer::onTextureUploadComplete(const LLUUID& uuid, void* userdata, S32 result) // StoreAssetData callback (not fixed)
+void LLTexLayerSetBuffer::onTextureUploadComplete(const LLUUID& uuid, void* userdata, S32 result, LLExtStat ext_status) // StoreAssetData callback (not fixed)
 {
        LLBakedUploadData* baked_upload_data = (LLBakedUploadData*)userdata;
diff --git a/linden/indra/newview/lltexlayer.h b/linden/indra/newview/lltexlayer.h
index 7d517ee..e5bfb79 100644
--- a/linden/indra/newview/lltexlayer.h
+++ b/linden/indra/newview/lltexlayer.h
@@ -221,7 +221,7 @@ public:
        void                                    readBackAndUpload(U8* baked_bump_data);
        static void                             onTextureUploadComplete( const LLUUID& uuid,
                                                                                                         void* userdata,
-                                                                                                         S32 result);
+                                                                                                         S32 result, LLExtStat ext_status);
        static void                             dumpTotalByteCount();
 private:
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index 6602096..9c64bd3 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -129,7 +129,7 @@ public:
        void                    setCanApplyImmediately(BOOL b);
        void                    setDirty( BOOL b ) { mIsDirty = b; }
-        BOOL                    isDirty() { return mIsDirty; }
+        BOOL                    isDirty() const { return mIsDirty; }
        void                    setActive( BOOL active );
        LLTextureCtrl*  getOwner() const { return mOwner; }
@@ -908,7 +908,8 @@ LLTextureCtrl::LLTextureCtrl(
        mNonImmediateFilterPermMask( PERM_NONE ),
        mCanApplyImmediately( FALSE ),
        mNeedsRawImageData( FALSE ),
-        mValid( TRUE )
+        mValid( TRUE ),
+        mDirty( FALSE )
 {
        mCaption = new LLTextBox( label, 
                LLRect( 0, BTN_HEIGHT_SMALL, mRect.getWidth(), 0 ),
@@ -1070,6 +1071,18 @@ void LLTextureCtrl::setValid(BOOL valid )
        }
 }
+// virtual 
+BOOL    LLTextureCtrl::isDirty() const          
+{ 
+        return mDirty;  
+}
+// virtual 
+void    LLTextureCtrl::resetDirty()
+{ 
+        mDirty = FALSE; 
+}
 // virtual
 void LLTextureCtrl::clear()
@@ -1186,6 +1199,7 @@ void LLTextureCtrl::onFloaterCommit(ETexturePickOp op)
        if( floaterp && mEnabled)
        {
+                mDirty = (op != TEXTURE_CANCEL);
                if( floaterp->isDirty() )
                {
                        setTentative( FALSE );
diff --git a/linden/indra/newview/lltexturectrl.h b/linden/indra/newview/lltexturectrl.h
index d8ad4d9..853ca73 100644
--- a/linden/indra/newview/lltexturectrl.h
+++ b/linden/indra/newview/lltexturectrl.h
@@ -87,6 +87,9 @@ public:
        virtual void    setVisible( BOOL visible );
        virtual void    setEnabled( BOOL enabled );
+        virtual BOOL    isDirty() const;
+        virtual void    resetDirty();
        void                    setValid(BOOL valid);
        // LLUICtrl interface
@@ -169,6 +172,7 @@ private:
        BOOL                                     mNeedsRawImageData;
        LLViewBorder*                    mBorder;
        BOOL                                     mValid;
+        BOOL                                     mDirty;
 };
 // XUI HACK: When floaters converted, switch this file to lltexturepicker.h/cpp
diff --git a/linden/indra/newview/lltoolgrab.cpp b/linden/indra/newview/lltoolgrab.cpp
index d6f1f0e..e79121a 100644
--- a/linden/indra/newview/lltoolgrab.cpp
+++ b/linden/indra/newview/lltoolgrab.cpp
@@ -803,9 +803,10 @@ void LLToolGrab::onMouseCaptureLost()
                        LLVector3 grab_point_agent = mGrabObject->getRenderPosition();
                        LLCoordGL gl_point;
-                        gCamera->projectPosAgentToScreen(grab_point_agent, gl_point);
+                        if (gCamera->projectPosAgentToScreen(grab_point_agent, gl_point))
+                        {
-                        LLUI::setCursorPositionScreen(gl_point.mX, gl_point.mY);
+                                LLUI::setCursorPositionScreen(gl_point.mX, gl_point.mY);
+                        }
                }
                else
                {
diff --git a/linden/indra/newview/lltoolmorph.cpp b/linden/indra/newview/lltoolmorph.cpp
index ceb83b5..25d7d2e 100644
--- a/linden/indra/newview/lltoolmorph.cpp
+++ b/linden/indra/newview/lltoolmorph.cpp
@@ -153,6 +153,8 @@ void LLVisualParamHint::preRender(BOOL clear_depth)
        avatarp->updateComposites();
        avatarp->updateVisualParams();
        avatarp->updateGeometry(avatarp->mDrawable);
+        avatarp->updateLOD();
        LLDynamicTexture::preRender(clear_depth);
 }
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 0e3a5fe..0aa7d10 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -551,9 +551,9 @@ BOOL LLToolPie::handleMouseUp(S32 x, S32 y, MASK mask)
                        break;
                }
        }
        mGrabMouseButtonDown = FALSE;
        gToolMgr->clearTransientTool();
+        gAgent.setLookAt(LOOKAT_TARGET_CONVERSATION, obj); // maybe look at object/person clicked on
        return LLTool::handleMouseUp(x, y, mask);
 }
diff --git a/linden/indra/newview/lltracker.cpp b/linden/indra/newview/lltracker.cpp
index 4125bb6..feb4207 100644
--- a/linden/indra/newview/lltracker.cpp
+++ b/linden/indra/newview/lltracker.cpp
@@ -107,15 +107,6 @@ void LLTracker::stopTracking(void* userdata)
 // static virtual
 void LLTracker::drawHUDArrow()
 {
-        /* tracking autopilot destination has been disabled 
-           -- 2004.01.09, Leviathan
-        // Draw dot for autopilot target
-        if (gAgent.getAutoPilot())
-        {
-                instance()->drawMarker( gAgent.getAutoPilotTargetGlobal(), gTrackColor );
-                return;
-        }
-        */
        switch (getTrackingStatus())
        { 
        case TRACKING_AVATAR:
@@ -479,7 +470,6 @@ void LLTracker::renderBeacon(LLVector3d pos_global,
        if (dist > 0.99f * gCamera->getFar())
        {
                color_frac = 0.4f;
-        //      pos_global = gAgent.getCameraPositionGlobal() + 0.99f*(gCamera->getFar()/dist)*to_vec;
        }
        else
        {
@@ -504,7 +494,6 @@ void LLTracker::renderBeacon(LLVector3d pos_global,
                
                draw_shockwave(1024.f, gRenderStartTime.getElapsedTimeF32(), 32, fogged_color);
-                //glScalef(1.f, 1.f, 1000.f);
                glColor4fv(fogged_color.mV);
                const U32 BEACON_VERTS = 256;
                const F32 step = 1024.0f/BEACON_VERTS;
@@ -554,24 +543,30 @@ void LLTracker::renderBeacon(LLVector3d pos_global,
                        glEnd();
                }
                                                        
-                //gCylinder.render(1000);
        glPopMatrix();
-        char text[1024];                /* Flawfinder: ignore */
+        if (!gCamera || to_vec.magVec() > gCamera->getFar())
-        snprintf(text, sizeof(text), "%.0f m", to_vec.magVec());                /* Flawfinder: ignore */
+        {
+                hud_textp->clearString();
+        }
+        else
+        {
+                char text[1024];                /* Flawfinder: ignore */
+                snprintf(text, sizeof(text), "%.0f m", to_vec.magVec());                /* Flawfinder: ignore */
-        LLWString wstr;
+                LLWString wstr;
-        wstr += utf8str_to_wstring(label);
+                wstr += utf8str_to_wstring(label);
-        wstr += '\n';
+                wstr += '\n';
-        wstr += utf8str_to_wstring(text);
+                wstr += utf8str_to_wstring(text);
-        hud_textp->setFont(LLFontGL::sSansSerif);
+                hud_textp->setFont(LLFontGL::sSansSerif);
-        hud_textp->setZCompare(FALSE);
+                hud_textp->setZCompare(FALSE);
-        hud_textp->setColor(LLColor4(1.f, 1.f, 1.f, llmax(0.2f, llmin(1.f,(dist-FADE_DIST)/FADE_DIST))));
+                hud_textp->setColor(LLColor4(1.f, 1.f, 1.f, llmax(0.2f, llmin(1.f,(dist-FADE_DIST)/FADE_DIST))));
-        hud_textp->setString(wstr);
+                hud_textp->setString(wstr);
-        hud_textp->setVertAlignment(LLHUDText::ALIGN_VERT_CENTER);
+                hud_textp->setVertAlignment(LLHUDText::ALIGN_VERT_CENTER);
-        hud_textp->setPositionAgent(pos_agent);
+                hud_textp->setPositionAgent(pos_agent);
+        }
 }
@@ -643,6 +638,14 @@ void LLTracker::drawMarker(const LLVector3d& pos_global, const LLColor4& color)
                return;
        }
+        LLVector3d to_vec = pos_global - gAgent.getCameraPositionGlobal();
+        to_vec.mdV[2] = 0;
+        if (to_vec.magVec() > gCamera->getFar())
+        {       //only draw arrow if lateral distance to object is less than view distance.
+                return;
+        }
        // get position
        LLVector3 pos_local = gAgent.getPosAgentFromGlobal(pos_global);
diff --git a/linden/indra/newview/lluserauth.cpp b/linden/indra/newview/lluserauth.cpp
index f790fe7..6c45b8d 100644
--- a/linden/indra/newview/lluserauth.cpp
+++ b/linden/indra/newview/lluserauth.cpp
@@ -34,7 +34,7 @@
 #include <iterator>
 #include "lldir.h"
-#include "llversion.h"
+#include "llversionviewer.h"
 #include "viewer.h"
 #include "llviewerbuild.h"
 #include "llviewercontrol.h"
diff --git a/linden/indra/newview/llviewerassetstorage.cpp b/linden/indra/newview/llviewerassetstorage.cpp
index d9a5ada..7947700 100644
--- a/linden/indra/newview/llviewerassetstorage.cpp
+++ b/linden/indra/newview/llviewerassetstorage.cpp
@@ -88,7 +88,7 @@ void LLViewerAssetStorage::storeAssetData(
                                delete req;
                                if (callback)
                                {
-                                        callback(asset_id, user_data, LL_ERR_ASSET_REQUEST_FAILED);
+                                        callback(asset_id, user_data, LL_ERR_ASSET_REQUEST_FAILED, LL_EXSTAT_VFS_CORRUPT);
                                }
                                return;
                        }
@@ -117,7 +117,7 @@ void LLViewerAssetStorage::storeAssetData(
                                        llwarns << "Probable corruption in VFS file, aborting store asset data" << llendl;
                                        if (callback)
                                        {
-                                                callback(asset_id, user_data,  LL_ERR_ASSET_REQUEST_NONEXISTENT_FILE);
+                                                callback(asset_id, user_data, LL_ERR_ASSET_REQUEST_NONEXISTENT_FILE, LL_EXSTAT_VFS_CORRUPT);
                                        }
                                        return;
                                }
@@ -142,7 +142,7 @@ void LLViewerAssetStorage::storeAssetData(
                        llwarns << "AssetStorage: attempt to upload non-existent vfile " << asset_id << ":" << LLAssetType::lookup(asset_type) << llendl;
                        if (callback)
                        {
-                                callback(asset_id, user_data,  LL_ERR_ASSET_REQUEST_NONEXISTENT_FILE);
+                                callback(asset_id, user_data,  LL_ERR_ASSET_REQUEST_NONEXISTENT_FILE, LL_EXSTAT_NONEXISTENT_FILE);
                        }
                }
        }
@@ -151,7 +151,7 @@ void LLViewerAssetStorage::storeAssetData(
                llwarns << "Attempt to move asset store request upstream w/o valid upstream provider" << llendl;
                if (callback)
                {
-                        callback(asset_id, user_data, LL_ERR_CIRCUIT_GONE);
+                        callback(asset_id, user_data, LL_ERR_CIRCUIT_GONE, LL_EXSTAT_NO_UPSTREAM);
                }
        }
 }
@@ -220,7 +220,7 @@ void LLViewerAssetStorage::storeAssetData(
        {
                if (callback)
                {
-                        callback(asset_id, user_data, LL_ERR_CANNOT_OPEN_FILE);
+                        callback(asset_id, user_data, LL_ERR_CANNOT_OPEN_FILE, LL_EXSTAT_BLOCKED_FILE);
                }
        }
 }
diff --git a/linden/indra/newview/llviewerassetstorage.h b/linden/indra/newview/llviewerassetstorage.h
index 46840cb..c49820a 100644
--- a/linden/indra/newview/llviewerassetstorage.h
+++ b/linden/indra/newview/llviewerassetstorage.h
@@ -37,8 +37,6 @@ class LLVFile;
 class LLViewerAssetStorage : public LLAssetStorage
 {
 public:
-        typedef void (*LLStoreAssetCallback)(const LLUUID &transaction_id, void *user_data, S32 status);
        LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
                                   LLVFS *vfs, const LLHost &upstream_host);
diff --git a/linden/indra/newview/llviewerbuild.h b/linden/indra/newview/llviewerbuild.h
index 340d353..82a35b0 100644
--- a/linden/indra/newview/llviewerbuild.h
+++ b/linden/indra/newview/llviewerbuild.h
@@ -26,8 +26,8 @@
 * COMPLETENESS OR PERFORMANCE.
 */
-#include "llversion.h"
+#include "llversionviewer.h"
-// Set the build number in indra/llcommon/llversion.h!
+// Set the build number in indra/llcommon/llversionviewer.h!
 const S32 LL_VIEWER_BUILD = LL_VERSION_BUILD;
diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp
index fc288c0..64ad66c 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -35,6 +35,7 @@
 #include "lldir.h"
 #include "lldynamictexture.h"
 #include "lldrawpoolalpha.h"
+#include "llfeaturemanager.h"
 #include "llframestats.h"
 #include "llgl.h"
 #include "llglheaders.h"
@@ -217,7 +218,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield)
        // Bail out if we're in the startup state and don't want to try to
        // render the world.
        //
-        if (gStartupState < STATE_STARTED)
+        if (LLStartUp::getStartupState() < STATE_STARTED)
        {
                display_startup();
                return;
@@ -315,12 +316,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield)
                        }
                        break;
-                case LLAgent::TELEPORT_CANCELLING:
-                        gViewerWindow->setProgressCancelButtonVisible(FALSE, "Cancel");
-                        gViewerWindow->setProgressPercent(  100.f );
-                        gViewerWindow->setProgressString("Canceling...");
-                        break;
                case LLAgent::TELEPORT_NONE:
                        // No teleport in progress
                        gViewerWindow->setShowProgress(FALSE);
@@ -430,7 +425,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield)
        }
        else
        {
-                LLPipeline::sUseOcclusion = gSavedSettings.getBOOL("UseOcclusion") && gGLManager.mHasOcclusionQuery;
+                LLPipeline::sUseOcclusion = gSavedSettings.getBOOL("UseOcclusion") && gGLManager.mHasOcclusionQuery && gFeatureManagerp->isFeatureAvailable("UseOcclusion");
        }
        stop_glerror();
diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp
index e40fb80..f4cd582 100644
--- a/linden/indra/newview/llviewerimage.cpp
+++ b/linden/indra/newview/llviewerimage.cpp
@@ -155,9 +155,9 @@ void LLViewerImage::updateClass(const F32 velocity, const F32 angular_velocity)
                sMaxTotalTextureMem -= sMaxBoundTextureMem/4;
        }
        
-        if ((U32)sMaxTotalTextureMem > gSysMemory.getPhysicalMemory() - (U32)min_non_tex_system_mem)
+        if ((U32)sMaxTotalTextureMem > gSysMemory.getPhysicalMemoryClamped() - (U32)min_non_tex_system_mem)
        {
-                sMaxTotalTextureMem = (S32)gSysMemory.getPhysicalMemory() - min_non_tex_system_mem;
+                sMaxTotalTextureMem = (S32)gSysMemory.getPhysicalMemoryClamped() - min_non_tex_system_mem;
        }
        
        if (sBoundTextureMemory >= sMaxBoundTextureMem ||
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index 2e3b964..890629e 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -1142,6 +1142,12 @@ LLPointer<LLImageJ2C> LLViewerImageList::convertToUploadFile(LLPointer<LLImageRa
        raw_image->biasedScaleToPowerOfTwo(LLViewerImage::MAX_IMAGE_SIZE_DEFAULT);
        LLPointer<LLImageJ2C> compressedImage = new LLImageJ2C();
        compressedImage->setRate(0.f);
+        
+        if (gSavedSettings.getBOOL("LosslessJ2CUpload") &&
+                (raw_image->getWidth() <= LL_IMAGE_REZ_LOSSLESS_CUTOFF) &&
+                (raw_image->getHeight() <= LL_IMAGE_REZ_LOSSLESS_CUTOFF))
+                compressedImage->setReversible(TRUE);
+        
        compressedImage->encode(raw_image);
        return compressedImage;
@@ -1170,7 +1176,7 @@ S32 LLViewerImageList::getMaxVideoRamSetting(S32 max)
                }
                llwarns << "VRAM amount not detected, defaulting to " << max_vram/(double)(1<<20) << " MB" << llendl;
        }
-        U32 system_ram = gSysMemory.getPhysicalMemory();
+        U32 system_ram = gSysMemory.getPhysicalMemoryClamped();
        //llinfos << "*** DETECTED " << system_ram/(double)(1<<20) << " MB of system memory." << llendl; // TomY TESTING DNCI
        if (max == -2)
        {
@@ -1396,7 +1402,7 @@ S32 LLViewerImageList::calcMaxTextureRAM()
 {
        // Decide the maximum amount of RAM we should allow the user to allocate to texture cache
        LLMemoryInfo memory_info;
-        U32 available_memory = memory_info.getPhysicalMemory();
+        U32 available_memory = memory_info.getPhysicalMemoryClamped();
        
        clamp_rescale((F32)available_memory,
                                 (F32)(SIXTEEN_MEG * 16),
diff --git a/linden/indra/newview/llviewerimagelist.h b/linden/indra/newview/llviewerimagelist.h
index 0a7f8b0..266bcfc 100644
--- a/linden/indra/newview/llviewerimagelist.h
+++ b/linden/indra/newview/llviewerimagelist.h
@@ -37,6 +37,8 @@
 #include <list>
 #include <set>
+const U32 LL_IMAGE_REZ_LOSSLESS_CUTOFF = 128;
 const BOOL MIPMAP_YES = TRUE;
 const BOOL MIPMAP_NO = FALSE;
diff --git a/linden/indra/newview/llviewerinventory.cpp b/linden/indra/newview/llviewerinventory.cpp
index 6372ba8..c9cd52f 100644
--- a/linden/indra/newview/llviewerinventory.cpp
+++ b/linden/indra/newview/llviewerinventory.cpp
@@ -43,6 +43,9 @@
 #include "llinventoryview.h"
+#include "llviewerregion.h"
+#include "llviewerobjectlist.h"
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
@@ -551,13 +554,27 @@ void inventory_reliable_callback(void**, S32 status)
        }
 }
 */
+LLInventoryCallbackManager *LLInventoryCallbackManager::sInstance = NULL;
 LLInventoryCallbackManager::LLInventoryCallbackManager() :
        mLastCallback(0)
 {
+        if( sInstance != NULL )
+        {
+                llwarns << "LLInventoryCallbackManager::LLInventoryCallbackManager: unexpected multiple instances" << llendl;
+                return;
+        }
+        sInstance = this;
 }
 LLInventoryCallbackManager::~LLInventoryCallbackManager()
 {
+        if( sInstance != this )
+        {
+                llwarns << "LLInventoryCallbackManager::~LLInventoryCallbackManager: unexpected multiple instances" << llendl;
+                return;
+        }
+        sInstance = NULL;
 }
 U32 LLInventoryCallbackManager::registerCB(LLPointer<LLInventoryCallback> cb)
@@ -701,29 +718,56 @@ void move_inventory_item(
        gAgent.sendReliableMessage();
 }
-void _copy_inventory_from_notecard_hdr(const LLUUID& object_id, const LLUUID& notecard_inv_id)
+class LLCopyInventoryFromNotecardResponder : public LLHTTPClient::Responder
 {
-        LLMessageSystem* msg = gMessageSystem;
+public:
-        msg->newMessageFast(_PREHASH_CopyInventoryFromNotecard);
+        //If we get back a normal response, handle it here
-        msg->nextBlock(_PREHASH_AgentData);
+        virtual void result(const LLSD& content)
-        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+        {
-        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                // What do we do here?
-        msg->nextBlock(_PREHASH_NotecardData);
+                llinfos << "CopyInventoryFromNotecard request successful." << llendl;
-        msg->addUUIDFast(_PREHASH_NotecardItemID, notecard_inv_id);
+        }
-        msg->addUUIDFast(_PREHASH_ObjectID, object_id);
-}
+        //If we get back an error (not found, etc...), handle it here
+        virtual void error(U32 status, const std::string& reason)
+        {
+                llinfos << "LLCopyInventoryFromNotecardResponder::error "
+                        << status << ": " << reason << llendl;
+        }
+};
-void copy_inventory_from_notecard(const LLUUID& object_id, const LLUUID& notecard_inv_id, const LLInventoryItem *src)
+void copy_inventory_from_notecard(const LLUUID& object_id, const LLUUID& notecard_inv_id, const LLInventoryItem *src, U32 callback_id)
 {
-        LLMessageSystem* msg = gMessageSystem;
+        LLSD body;
-        /*
+        LLViewerRegion* viewer_region = NULL;
-         * I was going to handle multiple inventory items here, but then I realized that
+        if(object_id.notNull())
-         * we are only handling one at a time.  Perhaps you can only select one at a 
+        {
-         * time from the notecard?
+                LLViewerObject* vo = gObjectList.findObject(object_id);
-         */
+                if(vo)
-        _copy_inventory_from_notecard_hdr(object_id, notecard_inv_id);
+                {
-        msg->nextBlockFast(_PREHASH_InventoryData);
+                        viewer_region = vo->getRegion();
-        msg->addUUIDFast(_PREHASH_ItemID, src->getUUID());
+                }
-        msg->addUUIDFast(_PREHASH_FolderID, gInventory.findCategoryUUIDForType(src->getType()));
+        }
-        gAgent.sendReliableMessage();
+        // Fallback to the agents region if for some reason the 
+        // object isn't found in the viewer.
+        if(!viewer_region)
+        {
+                viewer_region = gAgent.getRegion();
+        }
+        if(viewer_region)
+        {
+                std::string url = viewer_region->getCapability("CopyInventoryFromNotecard");
+                if (!url.empty())
+                {
+                        body["notecard-id"] = notecard_inv_id;
+                        body["object-id"] = object_id;
+                        body["item-id"] = src->getUUID();
+                        body["folder-id"] = gInventory.findCategoryUUIDForType(src->getType());
+                        body["callback-id"] = (LLSD::Integer)callback_id;
+                        LLHTTPClient::post(url, body, new LLCopyInventoryFromNotecardResponder());
+                }
+        }
 }
diff --git a/linden/indra/newview/llviewerinventory.h b/linden/indra/newview/llviewerinventory.h
index 513834f..1226a83 100644
--- a/linden/indra/newview/llviewerinventory.h
+++ b/linden/indra/newview/llviewerinventory.h
@@ -234,6 +234,9 @@ public:
 private:
        std::map<U32, LLPointer<LLInventoryCallback> > mMap;
        U32 mLastCallback;
+        static LLInventoryCallbackManager *sInstance;
+public:
+        static bool is_instantiated() { return sInstance != NULL; }
 };
 extern LLInventoryCallbackManager gInventoryCallbacks;
@@ -269,7 +272,8 @@ void move_inventory_item(
 void copy_inventory_from_notecard(const LLUUID& object_id,
                                                                  const LLUUID& notecard_inv_id,
-                                                                  const LLInventoryItem *src);
+                                                                  const LLInventoryItem *src,
+                                                                  U32 callback_id = 0);
 #endif // LL_LLVIEWERINVENTORY_H
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 4ac1da4..0d7a2cd 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -40,6 +40,7 @@
 #include "indra_constants.h"
 #include "llassetstorage.h"
 #include "llchat.h"
+#include "llfeaturemanager.h"
 #include "llfocusmgr.h"
 #include "llfontgl.h"
 #include "llinstantmessage.h"
@@ -98,6 +99,7 @@
 #include "llfloatergesture.h"
 #include "llfloatergodtools.h"
 #include "llfloatergroupinfo.h"
+#include "llfloatergroupinvite.h"
 #include "llfloatergroups.h"
 #include "llfloaterhtml.h"
 #include "llfloaterhtmlhelp.h"
@@ -411,7 +413,7 @@ void toggle_debug_menus(void*);
 void toggle_map( void* user_data );
 void export_info_callback(LLAssetInfo *info, void **user_data, S32 result);
 void export_data_callback(LLVFS *vfs, const LLUUID& uuid, LLAssetType::EType type, void **user_data, S32 result);
-void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result);
+void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result, LLExtStat ext_status);
 BOOL menu_check_build_tool( void* user_data );
 void handle_reload_settings(void*);
 void focus_here(void*);
@@ -1226,7 +1228,7 @@ void init_debug_rendering_menu(LLMenuGL* menu)
        LLMenuItemCheckGL* item;
        item = new LLMenuItemCheckGL("Object-Object Occlusion", menu_toggle_control, NULL, menu_check_control, (void*)"UseOcclusion", 'O', MASK_CONTROL|MASK_SHIFT);
-        item->setEnabled(gGLManager.mHasOcclusionQuery);
+        item->setEnabled(gGLManager.mHasOcclusionQuery && gFeatureManagerp->isFeatureAvailable("UseOcclusion"));
        menu->append(item);
        
        
@@ -5100,6 +5102,43 @@ class LLToolsLookAtSelection : public view_listener_t
        }
 };
+void callback_invite_to_group(LLUUID group_id, void *user_data)
+{
+        std::vector<LLUUID> agent_ids;
+        agent_ids.push_back(*(LLUUID *)user_data);
+        
+        LLFloaterGroupInvite::showForGroup(group_id, &agent_ids);
+}
+void invite_to_group(const LLUUID& dest_id)
+{
+        LLViewerObject* dest = gObjectList.findObject(dest_id);
+        if(dest && dest->isAvatar())
+        {
+                LLFloaterGroupPicker* widget;
+                widget = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));
+                if (widget)
+                {
+                        widget->center();
+                        widget->setPowersMask(GP_MEMBER_INVITE);
+                        widget->setSelectCallback(callback_invite_to_group, (void *)&dest_id);
+                }
+        }
+}
+class LLAvatarInviteToGroup : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLVOAvatar* avatar = find_avatar_from_object( gViewerWindow->lastObjectHit() );
+                if(avatar)
+                {
+                        invite_to_group(avatar->getID());
+                }
+                return true;
+        }
+};
 class LLAvatarAddFriend : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -7434,7 +7473,7 @@ class LLViewToggleRenderType : public view_listener_t
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
                LLString type = userdata.asString();
-                if (type == "particles")
+                if (type == "hideparticles")
                {
                        LLPipeline::toggleRenderType(LLPipeline::RENDER_TYPE_PARTICLES);
                }
@@ -7448,7 +7487,7 @@ class LLViewCheckRenderType : public view_listener_t
        {
                LLString type = userdata["data"].asString();
                bool new_value = false;
-                if (type == "particles")
+                if (type == "hideparticles")
                {
                        new_value = LLPipeline::toggleRenderTypeControlNegated((void *)LLPipeline::RENDER_TYPE_PARTICLES);
                }
@@ -7750,6 +7789,7 @@ void initialize_menus()
        addMenu(new LLAvatarDebug(), "Avatar.Debug");
        addMenu(new LLAvatarVisibleDebug(), "Avatar.VisibleDebug");
        addMenu(new LLAvatarEnableDebug(), "Avatar.EnableDebug");
+        addMenu(new LLAvatarInviteToGroup(), "Avatar.InviteToGroup");
        addMenu(new LLAvatarGiveCard(), "Avatar.GiveCard");
        addMenu(new LLAvatarEject(), "Avatar.Eject");
        addMenu(new LLAvatarSendIM(), "Avatar.SendIM");
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index 4d46a8f..031e6d4 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -796,7 +796,7 @@ void upload_new_resource(const LLString& src_filename, std::string name,
        }
 }
-void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result) // StoreAssetData callback (fixed)
+void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
        LLResourceData* data = (LLResourceData*)user_data;
        //LLAssetType::EType pref_loc = data->mPreferredLocation;
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 6bca17e..8f3cd96 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -84,6 +84,7 @@
 #include "llfloatermute.h"
 #include "llfloaterpostcard.h"
 #include "llfloaterpreference.h"
+#include "llfloaterreleasemsg.h"
 #include "llfollowcam.h"
 #include "llgroupnotify.h"
 #include "llhudeffect.h"
@@ -573,6 +574,15 @@ void join_group_callback(S32 option, void* user_data)
        LLJoinGroupData* data = (LLJoinGroupData*)user_data;
        BOOL delete_context_data = TRUE;
        bool accept_invite = false;
+        if (option == 2 && data && !data->mGroupID.isNull())
+        {
+                LLFloaterGroupInfo::showFromUUID(data->mGroupID);
+                LLString::format_map_t args;
+                args["[MESSAGE]"] = data->mMessage;
+                LLNotifyBox::showXml("JoinGroup", args, &join_group_callback, data);
+                return;
+        }
        if(option == 0 && data && !data->mGroupID.isNull())
        {
                // check for promotion or demotion.
@@ -763,7 +773,7 @@ bool check_offer_throttle(const std::string& from_name, bool check_only)
                //llinfos << "Throttle Not Expired, Count: " << throttle_count << llendl;
                // When downloading the initial inventory we get a lot of new items
                // coming in and can't tell that from spam.  JC
-                if (gStartupState >= STATE_STARTED
+                if (LLStartUp::getStartupState() >= STATE_STARTED
                        && throttle_count >= OFFER_THROTTLE_MAX_COUNT)
                {
                        if (!throttle_logged)
@@ -2162,7 +2172,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
        {
                is_muted = gMuteListp->isMuted(from_id, from_name, LLMute::flagTextChat)
                                   || gMuteListp->isMuted(owner_id);
-                is_linden = gMuteListp->isLinden(from_name);
+                is_linden = chat.mSourceType != CHAT_SOURCE_OBJECT && gMuteListp->isLinden(from_name);
        }
        BOOL is_audible = (CHAT_AUDIBLE_FULLY == chat.mAudible);
@@ -2319,16 +2329,16 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                }
                // truth table:
-                // LINDEN       BUSY    MUTED   OWNED_BY_YOU                    DISPLAY         STORE IN HISTORY
+                // LINDEN       BUSY    MUTED   OWNED_BY_YOU    TASK            DISPLAY         STORE IN HISTORY
-                // F            F               F               F                                               Yes                     Yes
+                // F            F               F               F                               *                       Yes                     Yes
-                // F            F               F               T                                               Yes                     Yes
+                // F            F               F               T                               *                       Yes                     Yes
-                // F            F               T               F                                               No                      No
+                // F            F               T               F                               *                       No                      No
-                // F            F               T               T                                               No                      No
+                // F            F               T               T                               *                       No                      No
-                // F            T               F               F                                               No                      Yes
+                // F            T               F               F                               *                       No                      Yes
-                // F            T               F               T                                               Yes                     Yes
+                // F            T               F               T                               *                       Yes                     Yes
-                // F            T               T               F                                               No                      No
+                // F            T               T               F                               *                       No                      No
-                // F            T               T               T                                               No                      No
+                // F            T               T               T                               *                       No                      No
-                // T            *               *               *                                               Yes                     Yes
+                // T            *               *               *                               F                       Yes                     Yes
                chat.mMuted = is_muted && !is_linden;
                
@@ -2427,47 +2437,103 @@ public:
        {
                LLIsType is_landmark(LLAssetType::AT_LANDMARK);
                LLIsType is_card(LLAssetType::AT_CALLINGCARD);
-                LLInventoryModel::cat_array_t cats;
-                LLInventoryModel::item_array_t items;
+                LLInventoryModel::cat_array_t   card_cats;
+                LLInventoryModel::item_array_t  card_items;
+                LLInventoryModel::cat_array_t   land_cats;
+                LLInventoryModel::item_array_t  land_items;
                folder_ref_t::iterator it = mCompleteFolders.begin();
                folder_ref_t::iterator end = mCompleteFolders.end();
                for(; it != end; ++it)
                {
                        gInventory.collectDescendentsIf(
                                (*it),
-                                cats,
+                                land_cats,
-                                items,
+                                land_items,
                                LLInventoryModel::EXCLUDE_TRASH,
                                is_landmark);
                        gInventory.collectDescendentsIf(
                                (*it),
-                                cats,
+                                card_cats,
-                                items,
+                                card_items,
                                LLInventoryModel::EXCLUDE_TRASH,
                                is_card);
                }
-                S32 count = items.count();
+                LLString::format_map_t args;
-                for(S32 i = 0; i < count; ++i)
+                if ( land_items.count() > 0 )
-                {
+                {       // Show notification that they can now teleport to landmarks.  Use a random landmark from the inventory
-                        LLString::format_map_t args;
+                        S32 random_land = ll_rand( land_items.count() - 1 );
-                        args["[NAME]"] = items[i]->getName();
+                        args["[NAME]"] = land_items[random_land]->getName();
-                        switch(items[i]->getType())
+                        LLNotifyBox::showXml("TeleportToLandmark",args);
-                        {
+                }
-                        case LLAssetType::AT_LANDMARK:
+                if ( card_items.count() > 0 )
-                                LLNotifyBox::showXml("TeleportToLandmark",args);
+                {       // Show notification that they can now contact people.  Use a random calling card from the inventory
-                                break;
+                        S32 random_card = ll_rand( card_items.count() - 1 );
-                        case LLAssetType::AT_CALLINGCARD:
+                        args["[NAME]"] = card_items[random_card]->getName();
-                                LLNotifyBox::showXml("TeleportToPerson",args);
+                        LLNotifyBox::showXml("TeleportToPerson",args);
-                                break;
-                        default:
-                                break;
-                        }
                }
                gInventory.removeObserver(this);
                delete this;
        }
 };
+class LLPostTeleportNotifiers : public LLEventTimer 
+{
+public:
+        LLPostTeleportNotifiers();
+        virtual ~LLPostTeleportNotifiers();
+        //function to be called at the supplied frequency
+        virtual BOOL tick();
+};
+LLPostTeleportNotifiers::LLPostTeleportNotifiers() : LLEventTimer( 2.0 )
+{
+};
+LLPostTeleportNotifiers::~LLPostTeleportNotifiers()
+{
+}
+BOOL LLPostTeleportNotifiers::tick()
+{
+        BOOL all_done = FALSE;
+        if ( gAgent.getTeleportState() == LLAgent::TELEPORT_NONE )
+        {
+                // get callingcards and landmarks available to the user arriving.
+                LLInventoryFetchDescendentsObserver::folder_ref_t folders;
+                LLUUID folder_id;
+                folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_CALLINGCARD);
+                if(folder_id.notNull()) 
+                        folders.push_back(folder_id);
+                folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_LANDMARK);
+                if(folder_id.notNull()) 
+                        folders.push_back(folder_id);
+                if(!folders.empty())
+                {
+                        LLFetchInWelcomeArea* fetcher = new LLFetchInWelcomeArea;
+                        fetcher->fetchDescendents(folders);
+                        if(fetcher->isEverythingComplete())
+                        {
+                                fetcher->done();
+                        }
+                        else
+                        {
+                                gInventory.addObserver(fetcher);
+                        }
+                }
+                all_done = TRUE;
+        }
+        return all_done;
+}
 // Teleport notification from the simulator
 // We're going to pretend to be a new agent
 void process_teleport_finish(LLMessageSystem* msg, void**)
@@ -2513,26 +2579,9 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
        {
                gAgent.setHomePosRegion(region_handle, pos);
-                // get callingcards and landmarks available to the user arriving.
+                // Create a timer that will send notices when teleporting is all finished.  Since this is 
-                LLInventoryFetchDescendentsObserver::folder_ref_t folders;
+                // based on the LLEventTimer class, it will be managed by that class and not orphaned or leaked.
-                LLUUID folder_id;
+                new LLPostTeleportNotifiers();
-                folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_CALLINGCARD);
-                if(folder_id.notNull()) folders.push_back(folder_id);
-                folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_LANDMARK);
-                if(folder_id.notNull()) folders.push_back(folder_id);
-                if(!folders.empty())
-                {
-                        LLFetchInWelcomeArea* fetcher = new LLFetchInWelcomeArea;
-                        fetcher->fetchDescendents(folders);
-                        if(fetcher->isEverythingComplete())
-                        {
-                                fetcher->done();
-                        }
-                        else
-                        {
-                                gInventory.addObserver(fetcher);
-                        }
-                }
        }
        LLHost sim_host(sim_ip, sim_port);
@@ -2632,6 +2681,9 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
        msg->getVector3Fast(_PREHASH_Data, _PREHASH_LookAt, look_at);
        U64 region_handle;
        msg->getU64Fast(_PREHASH_Data, _PREHASH_RegionHandle, region_handle);
+        
+        char version_channel_char[MAX_STRING];
+        msg->getString("SimData", "ChannelVersion", MAX_STRING, version_channel_char);
        LLVOAvatar* avatarp = gAgent.getAvatarObject();
        if (!avatarp)
@@ -2765,6 +2817,23 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
        msg->addBOOLFast(_PREHASH_AlwaysRun, gAgent.getAlwaysRun());
        gAgent.sendReliableMessage();
+        
+        LLString version_channel = LLString(version_channel_char);
+        if (gLastVersionChannel != version_channel)
+        {
+                //show release message if not on initial login
+                if (!gLastVersionChannel.empty())
+                { 
+                        gLastVersionChannel = version_channel;
+                        LLFloaterReleaseMsg::show();
+                }
+                else {
+                        gLastVersionChannel = version_channel;
+                }
+        }
+        
 }
 void process_crossed_region(LLMessageSystem* msg, void**)
@@ -4006,12 +4075,10 @@ void process_alert_core(const char* buffer, BOOL modal)
        else if( !strcmp( buffer, "Home position set." ) )
        {
                // save the home location image to disk
-                char temp_str[LL_MAX_PATH];             /* Flawfinder: ignore */
+                LLString snap_filename = gDirUtilp->getLindenUserDir();
-                strncpy(temp_str, gDirUtilp->getLindenUserDir().c_str(), LL_MAX_PATH -1);               /* Flawfinder: ignore */
+                snap_filename += gDirUtilp->getDirDelimiter();
-                temp_str[LL_MAX_PATH -1] = '\0';
+                snap_filename += SCREEN_HOME_FILENAME;
-                strcat(temp_str, "/");          /* Flawfinder: ignore */        
+                gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidth(), gViewerWindow->getWindowHeight(), FALSE, FALSE);
-                strcat(temp_str,SCREEN_HOME_FILENAME);          /* Flawfinder: ignore */
-                gViewerWindow->saveSnapshot(temp_str, gViewerWindow->getWindowWidth(), gViewerWindow->getWindowHeight(), FALSE, FALSE);
        }
        // Translate system messages here.
@@ -4562,7 +4629,16 @@ void process_teleport_failed(LLMessageSystem *msg, void**)
        msg->getStringFast(_PREHASH_Info, _PREHASH_Reason, STD_STRING_BUF_SIZE, reason);
        LLStringBase<char>::format_map_t args;
-        args["[REASON]"] = LLAgent::sTeleportErrorMessages[reason];
+        LLString big_reason = LLAgent::sTeleportErrorMessages[reason];
+        if ( big_reason.size() > 0 )
+        {       // Substitute verbose reason from the local map
+                args["[REASON]"] = big_reason;
+        }
+        else
+        {       // Nothing found in the map - use what the server returned
+                args["[REASON]"] = reason;
+        }
        gViewerWindow->alertXml("CouldNotTeleportReason", args);
        if( gAgent.getTeleportState() != LLAgent::TELEPORT_NONE )
@@ -5027,7 +5103,7 @@ void process_load_url(LLMessageSystem* msg, void**)
 }
-void callback_download_complete(void** data, S32 result)
+void callback_download_complete(void** data, S32 result, LLExtStat ext_status)
 {
        LLString* filepath = (LLString*)data;
        LLString::format_map_t args;
@@ -5164,7 +5240,7 @@ void callbackCacheEstateOwnerName(
 void onCovenantLoadComplete(LLVFS *vfs,
                                        const LLUUID& asset_uuid,
                                        LLAssetType::EType type,
-                                        void* user_data, S32 status)
+                                        void* user_data, S32 status, LLExtStat ext_status)
 {
        llinfos << "onCovenantLoadComplete()" << llendl;
        std::string covenant_text;
diff --git a/linden/indra/newview/llviewermessage.h b/linden/indra/newview/llviewermessage.h
index 14f2cda..7042324 100644
--- a/linden/indra/newview/llviewermessage.h
+++ b/linden/indra/newview/llviewermessage.h
@@ -180,7 +180,7 @@ void process_covenant_reply(LLMessageSystem* msg, void**);
 void onCovenantLoadComplete(LLVFS *vfs,
                                                        const LLUUID& asset_uuid,
                                                        LLAssetType::EType type,
-                                                        void* user_data, S32 status);
+                                                        void* user_data, S32 status, LLExtStat ext_status);
 void callbackCacheEstateOwnerName(
                const LLUUID& id,
                const char* first,
@@ -219,3 +219,4 @@ void process_feature_disabled_message(LLMessageSystem* msg, void**);
 #endif
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index f8095b8..ec81146 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -2438,7 +2438,7 @@ void LLViewerObject::processTaskInv(LLMessageSystem* msg, void** user_data)
                                                                LLXferManager::HIGH_PRIORITY);
 }
-void LLViewerObject::processTaskInvFile(void** user_data, S32 error_code)
+void LLViewerObject::processTaskInvFile(void** user_data, S32 error_code, LLExtStat ext_status)
 {
        LLFilenameAndTask* ft = (LLFilenameAndTask*)user_data;
        LLViewerObject* object = NULL;
diff --git a/linden/indra/newview/llviewerobject.h b/linden/indra/newview/llviewerobject.h
index fcb246c..09b1d57 100644
--- a/linden/indra/newview/llviewerobject.h
+++ b/linden/indra/newview/llviewerobject.h
@@ -539,7 +539,7 @@ protected:
        // inventory functionality
        //
-        static void processTaskInvFile(void** user_data, S32 error_code);
+        static void processTaskInvFile(void** user_data, S32 error_code, LLExtStat ext_status);
        void loadTaskInvFile(const char* filename);
        void doInventoryCallback();
        
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index 9f008a4..f8c20a3 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -654,13 +654,33 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
        
        std::vector<LLViewerObject*> kill_list;
        S32 num_active_objects = 0;
+        LLViewerObject *objectp = NULL; 
        
+        // Make a copy of the list in case something in idleUpdate() messes with it
+        std::vector<LLViewerObject*> idle_list;
+        idle_list.reserve( mActiveObjects.size() );
+        for (std::set<LLPointer<LLViewerObject> >::iterator active_iter = mActiveObjects.begin();
+                active_iter != mActiveObjects.end(); active_iter++)
+        {
+                objectp = *active_iter;
+                if (objectp)
+                {
+                        idle_list.push_back( objectp );
+                }
+                else
+                {       // There shouldn't be any NULL pointers in the list, but they have caused
+                        // crashes before.  This may be idleUpdate() messing with the list.
+                        llwarns << "LLViewerObjectList::update has a NULL objectp" << llendl;
+                }
+        }
        if (gSavedSettings.getBOOL("FreezeTime"))
        {
-                for (std::set<LLPointer<LLViewerObject> >::iterator iter = mActiveObjects.begin();
+                for (std::vector<LLViewerObject*>::iterator iter = idle_list.begin();
-                        iter != mActiveObjects.end(); iter++)
+                        iter != idle_list.end(); iter++)
                {
-                        LLViewerObject *objectp = *iter;
+                        objectp = *iter;
                        if (objectp->getPCode() == LLViewerObject::LL_VO_CLOUDS ||
                                objectp->isAvatar())
                        {
@@ -670,10 +690,10 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
        }
        else
        {
-                for (std::set<LLPointer<LLViewerObject> >::iterator iter = mActiveObjects.begin();
+                for (std::vector<LLViewerObject*>::iterator idle_iter = idle_list.begin();
-                        iter != mActiveObjects.end(); iter++)
+                        idle_iter != idle_list.end(); idle_iter++)
                {
-                        LLViewerObject *objectp = *iter;
+                        objectp = *idle_iter;
                        if (!objectp->idleUpdate(agent, world, frame_time))
                        {
                                //  If Idle Update returns false, kill object!
@@ -684,10 +704,10 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
                                num_active_objects++;
                        }
                }
-                for (std::vector<LLViewerObject*>::iterator iter = kill_list.begin();
+                for (std::vector<LLViewerObject*>::iterator kill_iter = kill_list.begin();
-                        iter != kill_list.end(); iter++)
+                        kill_iter != kill_list.end(); kill_iter++)
                {
-                        LLViewerObject *objectp = *iter;
+                        objectp = *kill_iter;
                        killObject(objectp);
                }
        }
@@ -1099,6 +1119,8 @@ U32 LLViewerObjectList::renderObjectsForSelect(LLCamera &camera, BOOL pick_parce
                        iter != pick_drawables.end(); iter++)
                {
                        LLDrawable* drawablep = *iter;
+                        if( !drawablep )
+                                continue;
                        LLViewerObject* last_objectp = NULL;
                        for (S32 face_num = 0; face_num < drawablep->getNumFaces(); face_num++)
diff --git a/linden/indra/newview/llviewerprecompiledheaders.h b/linden/indra/newview/llviewerprecompiledheaders.h
index 632fa22..f5a66a7 100644
--- a/linden/indra/newview/llviewerprecompiledheaders.h
+++ b/linden/indra/newview/llviewerprecompiledheaders.h
@@ -109,7 +109,7 @@
 #include "llthread.h"
 #include "lltimer.h"
 #include "lluuidhashmap.h"
-//#include "llversion.h"
+//#include "llversionviewer.h"
 //#include "processor.h"
 #include "stdenums.h"
 #include "stdtypes.h"
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 0a21e45..6378b01 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -1207,9 +1207,9 @@ public:
                llinfos << "BaseCapabilitiesComplete::error "
                        << statusNum << ": " << reason << llendl;
                
-                if (STATE_SEED_GRANTED_WAIT == gStartupState)
+                if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
                {
-                        gStartupState = STATE_SEED_CAP_GRANTED;
+                        LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED );
                }
    }
@@ -1223,9 +1223,9 @@ public:
                                << iter->first << llendl;
                }
                
-                if (STATE_SEED_GRANTED_WAIT == gStartupState)
+                if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
                {
-                        gStartupState = STATE_SEED_CAP_GRANTED;
+                        LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED );
                }
        }
@@ -1275,6 +1275,8 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
        capabilityNames.append("ParcelVoiceInfoRequest");
        capabilityNames.append("ChatSessionRequest");
        capabilityNames.append("ProvisionVoiceAccountRequest");
+        capabilityNames.append("ServerReleaseNotes");
+        capabilityNames.append("CopyInventoryFromNotecard");
        llinfos << "posting to seed " << url << llendl;
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 3369125..754132d 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -55,6 +55,68 @@
 extern BOOL gPacificDaylightTime;
+///----------------------------------------------------------------------------
+/// Class LLEmbeddedNotecardOpener
+///----------------------------------------------------------------------------
+class LLEmbeddedNotecardOpener : public LLInventoryCallback
+{
+        LLViewerTextEditor* mTextEditor;
+public:
+        LLEmbeddedNotecardOpener()
+                : mTextEditor(NULL)
+        {
+        }
+        void setEditor(LLViewerTextEditor* e) {mTextEditor = e;}
+        // override
+        void fire(const LLUUID& inv_item)
+        {
+                if(!mTextEditor)
+                {
+                        // The parent text editor may have vanished by now. 
+            // In that case just quit.
+                        return;
+                }
+                LLInventoryItem* item = gInventory.getItem(inv_item);
+                if(!item)
+                {
+                        llwarns << "Item add reported, but not found in inventory!: " << inv_item << llendl;
+                }
+                else
+                {
+                        // See if we can bring an existing preview to the front
+                        if(!LLPreview::show(item->getUUID(), true))
+                        {
+                                if(!gSavedSettings.getBOOL("ShowNewInventory"))
+                                {
+                                        // There isn't one, so make a new preview
+                                        S32 left, top;
+                                        gFloaterView->getNewFloaterPosition(&left, &top);
+                                        LLRect rect = gSavedSettings.getRect("NotecardEditorRect");
+                                        rect.translate(left - rect.mLeft, top - rect.mTop);
+                                        LLPreviewNotecard* preview;
+                                        preview = new LLPreviewNotecard("preview notecard", 
+                                                                                                        rect, 
+                                                                                                        LLString("Embedded Note: ") + item->getName(),
+                                                                                                        item->getUUID(), 
+                                                                                                        LLUUID::null, 
+                                                                                                        item->getAssetUUID(),
+                                                                                                        true, 
+                                                                                                        (LLViewerInventoryItem*)item);
+                                        preview->setSourceID(LLUUID::null);
+                                        preview->setFocus(TRUE);
+                                        // Force to be entirely onscreen.
+                                        gFloaterView->adjustToFitScreen(preview, FALSE);
+                                }
+                        }
+                }
+        }
+};
 ////////////////////////////////////////////////////////////
 // LLEmbeddedItems
 //
@@ -497,14 +559,21 @@ LLViewerTextEditor::LLViewerTextEditor(const LLString& name,
                                                                           const LLFontGL* font,
                                                                           BOOL allow_embedded_items)
        : LLTextEditor(name, rect, max_length, default_text, font, allow_embedded_items),
-          mDragItemSaved(FALSE)
+          mDragItemSaved(FALSE),
+          mInventoryCallback(new LLEmbeddedNotecardOpener)
 {
        mEmbeddedItemList = new LLEmbeddedItems(this);
+        mInventoryCallback->setEditor(this);
 }
 LLViewerTextEditor::~LLViewerTextEditor()
 {
        delete mEmbeddedItemList;
+        
+        
+        // The inventory callback may still be in use by gInventoryCallbackManager...
+        // so set its reference to this to null.
+        mInventoryCallback->setEditor(NULL); 
 }
 ///////////////////////////////////////////////////////////////////
@@ -1279,22 +1348,14 @@ void LLViewerTextEditor::openEmbeddedLandmark( LLInventoryItem* item )
        open_landmark((LLViewerInventoryItem*)item, "   preview landmark", FALSE, item->getUUID(), TRUE);
 }
 void LLViewerTextEditor::openEmbeddedNotecard( LLInventoryItem* item, BOOL saved )
 {
        if (saved)
        {
-                // Pop-up the notecard floater.
+                // An LLInventoryItem needs to be in an inventory to be opened.
-                // Note: Previously would copy to inventory and rely on autodisplay to view.
+                // This will give the item to the viewer's agent.
-                // Now that autodisplay can be turned off, we need to make this case display always. 
+                // The callback will attempt to open it if its not already opened.
-                // besides, there's no point adding to inventory -MG
+                copyInventory(item, gInventoryCallbacks.registerCB(mInventoryCallback));
-                open_notecard(
-                        (LLViewerInventoryItem*)item,
-                        LLString("Embedded Note: ") + item->getName(), // title
-                        mObjectID,
-                        FALSE, // show_keep_discard
-                        LLUUID::null, // source_id
-                        TRUE); // take_focus
        }
        else
        {
@@ -1369,11 +1430,11 @@ bool LLViewerTextEditor::importStream(std::istream& str)
        return success;
 }
-void LLViewerTextEditor::copyInventory(LLInventoryItem* item)
+void LLViewerTextEditor::copyInventory(const LLInventoryItem* item, U32 callback_id)
 {
        copy_inventory_from_notecard(mObjectID,
                                                                 mNotecardInventoryID,
-                                                                 item);
+                                                                 item, callback_id);
 }
 bool LLViewerTextEditor::hasEmbeddedInventory()
diff --git a/linden/indra/newview/llviewertexteditor.h b/linden/indra/newview/llviewertexteditor.h
index 1dbc7b6..230ce3e 100644
--- a/linden/indra/newview/llviewertexteditor.h
+++ b/linden/indra/newview/llviewertexteditor.h
@@ -33,7 +33,7 @@
 class LLInventoryItem;
 class LLEmbeddedItems;
+class LLEmbeddedNotecardOpener;
 //
 // Classes
@@ -86,7 +86,7 @@ public:
                // Appends Second Life time, small font, grey
                // If this starts a line, you need to prepend a newline.
-        void copyInventory(LLInventoryItem* item);
+        void copyInventory(const LLInventoryItem* item, U32 callback_id = 0);
        // returns true if there is embedded inventory.
        // *HACK: This is only useful because the notecard verifier may
@@ -123,6 +123,8 @@ protected:
        LLUUID mObjectID;
        LLUUID mNotecardInventoryID;
+        LLPointer<LLEmbeddedNotecardOpener> mInventoryCallback;
 };
 #endif  // LL_VIEWERTEXTEDITOR_H
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 13a4c41..fb52827 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -1305,7 +1305,7 @@ BOOL LLViewerWindow::handleActivate(LLWindow *window, BOOL activated)
                {
                        if (!gQuit)
                        {
-                                if (gStartupState >= STATE_STARTED)
+                                if (LLStartUp::getStartupState() >= STATE_STARTED)
                                {
                                        // if we're in world, show a progress bar to hide reloading of textures
                                        llinfos << "Restoring GL during activate" << llendl;
@@ -2746,27 +2746,11 @@ BOOL LLViewerWindow::handlePerFrameHover()
        gPipeline.sRenderProcessBeacons = FALSE;
        KEY key = gKeyboard->currentKey();
-        if (((mask & MASK_CONTROL) && ('N' == key || 'n' == key)) || (gFloaterTools && gFloaterTools->getVisible()) || gSavedSettings.getBOOL("BeaconAlwaysOn"))
+        if (((mask & MASK_CONTROL) && ('N' == key || 'n' == key)) || gSavedSettings.getBOOL("BeaconAlwaysOn"))
        {
                gPipeline.sRenderProcessBeacons = TRUE;
        }
-/*
-        // Show joints while in edit mode and hold down alt key.
-        if (gHUDManager)
-        {
-                BOOL menuOption = gSavedSettings.getBOOL("AltShowsPhysical");
-                if (menuOption
-                        || (gFloaterTools && gFloaterTools->getVisible()))
-                {
-                        gHUDManager->toggleShowPhysical( mask & MASK_ALT );
-                }
-                else
-                {
-                        gHUDManager->toggleShowPhysical( FALSE );
-                }
-        }
-*/
        BOOL handled = FALSE;
        BOOL handled_by_top_ctrl = FALSE;
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 3b9e8ea..456adfc 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -1372,6 +1372,7 @@ void LLVOAvatar::initClass()
        if (!skeleton_node)
        {
                llerrs << "No skeleton in avatar configuration file: " << xmlFile << llendl;
+                return;
        }
        
        LLString skeleton_file_name;
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 8a0e0dd..9e1c90a 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -1339,7 +1339,7 @@ void LLVoiceClient::stateMachine()
                                                        CloseHandle(pinfo.hThread); // stops leaks - nothing else
                                                }               
                                                
-                                                delete args2;
+                                                delete[] args2;
 #else   // LL_WINDOWS
                                                // This should be the same for mac and linux
                                                {
diff --git a/linden/indra/newview/llvoicevisualizer.cpp b/linden/indra/newview/llvoicevisualizer.cpp
index fca2226..2c64e46 100644
--- a/linden/indra/newview/llvoicevisualizer.cpp
+++ b/linden/indra/newview/llvoicevisualizer.cpp
@@ -1,3 +1,31 @@
+/** 
+ * @file llvoicevisualizer.cpp
+ * @brief Draws in-world speaking indicators.
+ *
+ * Copyright (c) 2000-2007, 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://secondlife.com/developers/opensource/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://secondlife.com/developers/opensource/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.
+ */
 //----------------------------------------------------------------------
 // Voice Visualizer
 // author: JJ Ventrella
diff --git a/linden/indra/newview/llvoicevisualizer.h b/linden/indra/newview/llvoicevisualizer.h
index ea53372..9cd0465 100644
--- a/linden/indra/newview/llvoicevisualizer.h
+++ b/linden/indra/newview/llvoicevisualizer.h
@@ -1,3 +1,31 @@
+/** 
+ * @file llvoicevisualizer.h
+ * @brief Draws in-world speaking indicators.
+ *
+ * Copyright (c) 2000-2007, 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://secondlife.com/developers/opensource/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://secondlife.com/developers/opensource/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.
+ */
 //--------------------------------------------------------------------
 //
 // VOICE VISUALIZER
diff --git a/linden/indra/newview/llvopartgroup.cpp b/linden/indra/newview/llvopartgroup.cpp
index 791b4ab..ad65a55 100644
--- a/linden/indra/newview/llvopartgroup.cpp
+++ b/linden/indra/newview/llvopartgroup.cpp
@@ -478,7 +478,7 @@ void LLParticlePartition::getGeometry(LLSpatialGroup* group)
        buffer->getTexCoordStrider(texcoordsp);
        buffer->getIndexStrider(indicesp);
-        std::vector<LLDrawInfo*>& draw_vec = group->mDrawMap[mRenderPass];
+        LLSpatialGroup::drawmap_elem_t& draw_vec = group->mDrawMap[mRenderPass];        
        for (std::vector<LLFace*>::iterator i = mFaceList.begin(); i != mFaceList.end(); ++i)
        {
diff --git a/linden/indra/newview/llvosky.cpp b/linden/indra/newview/llvosky.cpp
index 442ef23..32a8cac 100644
--- a/linden/indra/newview/llvosky.cpp
+++ b/linden/indra/newview/llvosky.cpp
@@ -31,6 +31,7 @@
 #include "llvosky.h"
 #include "imageids.h"
+#include "llfeaturemanager.h"
 #include "llviewercontrol.h"
 #include "llframetimer.h"
 #include "timing.h"
@@ -597,7 +598,7 @@ void LLVOSky::initCubeMap()
        {
                mCubeMap->init(images);
        }
-        else if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap)
+        else if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap && gFeatureManagerp->isFeatureAvailable("RenderCubeMap"))
        {
                mCubeMap = new LLCubeMap();
                mCubeMap->init(images);
@@ -634,7 +635,8 @@ void LLVOSky::restoreGL()
        calcBrightnessScaleAndColors();
-        if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap)
+        if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap
+            && gFeatureManagerp->isFeatureAvailable("RenderCubeMap"))
        {
                LLCubeMap* cube_map = getCubeMap();
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index a0a83f5..4656eda 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -2086,7 +2086,7 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
        }
        //add face to drawmap
-        std::vector<LLDrawInfo*>& draw_vec = group->mDrawMap[type];
+        LLSpatialGroup::drawmap_elem_t& draw_vec = group->mDrawMap[type];       
        S32 idx = draw_vec.size()-1;
@@ -2111,7 +2111,7 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
                U32 end = start + facep->getGeomCount()-1;
                U32 offset = facep->getIndicesStart();
                U32 count = facep->getIndicesCount();
-                LLDrawInfo* draw_info = new LLDrawInfo(start,end,count,offset,tex, 
+                LLPointer<LLDrawInfo> draw_info = new LLDrawInfo(start,end,count,offset,tex, 
                        facep->mVertexBuffer, fullbright, bump); 
                draw_info->mVSize = facep->getVirtualSize();
                draw_vec.push_back(draw_info);
@@ -2151,7 +2151,7 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
                U32 end = start + facep->getGeomCount()-1;
                U32 offset = facep->getIndicesStart();
                U32 count = facep->getIndicesCount();
-                LLDrawInfo* draw_info = new LLDrawInfo(start,end,count,offset,tex, 
+                LLPointer<LLDrawInfo> draw_info = new LLDrawInfo(start,end,count,offset,tex, 
                        facep->mVertexBuffer, fullbright, bump); 
                draw_info->mVSize = facep->getVirtualSize();
                draw_vec.push_back(draw_info);
diff --git a/linden/indra/newview/llwearable.cpp b/linden/indra/newview/llwearable.cpp
index 4dc3080..6db871c 100644
--- a/linden/indra/newview/llwearable.cpp
+++ b/linden/indra/newview/llwearable.cpp
@@ -934,7 +934,7 @@ void LLWearable::saveNewAsset()
 }
 // static
-void LLWearable::onSaveNewAssetComplete(const LLUUID& new_asset_id, void* userdata, S32 status) // StoreAssetData callback (fixed)
+void LLWearable::onSaveNewAssetComplete(const LLUUID& new_asset_id, void* userdata, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
        LLWearableSaveData* data = (LLWearableSaveData*)userdata;
        const char* type_name = LLWearable::typeToTypeName(data->mType);
@@ -1003,3 +1003,4 @@ void LLWearable::dump()
        }
 }
diff --git a/linden/indra/newview/llwearable.h b/linden/indra/newview/llwearable.h
index 1e953f5..41e9ed2 100644
--- a/linden/indra/newview/llwearable.h
+++ b/linden/indra/newview/llwearable.h
@@ -108,7 +108,7 @@ public:
        static LLAssetType::EType typeToAssetType( EWearableType wearable_type );
        void                            saveNewAsset();
-        static void                     onSaveNewAssetComplete( const LLUUID& asset_uuid, void* user_data, S32 status );
+        static void                     onSaveNewAssetComplete( const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status );
        BOOL                            isMatchedToInventoryItem( LLViewerInventoryItem* item );
diff --git a/linden/indra/newview/llwearablelist.cpp b/linden/indra/newview/llwearablelist.cpp
index b345ab0..8c56727 100644
--- a/linden/indra/newview/llwearablelist.cpp
+++ b/linden/indra/newview/llwearablelist.cpp
@@ -93,7 +93,7 @@ void LLWearableList::getAsset( const LLAssetID& assetID, const LLString& wearabl
 }
 // static
-void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID& uuid, void* userdata, S32 status )
+void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID& uuid, void* userdata, S32 status, LLExtStat ext_status )
 {
        BOOL success = FALSE;
        LLWearableArrivedData* data = (LLWearableArrivedData*) userdata;
diff --git a/linden/indra/newview/llwearablelist.h b/linden/indra/newview/llwearablelist.h
index 632f5af..3627685 100644
--- a/linden/indra/newview/llwearablelist.h
+++ b/linden/indra/newview/llwearablelist.h
@@ -59,7 +59,7 @@ public:
        LLWearable*                     createNewWearable( EWearableType type );
        
        // Pseudo-private
-        static void                 processGetAssetReply(const char* filename, const LLAssetID& assetID, void* user_data, S32 status);
+        static void                 processGetAssetReply(const char* filename, const LLAssetID& assetID, void* user_data, S32 status, LLExtStat ext_status);
 protected:
        LLPtrSkipMap< const LLUUID, LLWearable* > mList;
diff --git a/linden/indra/newview/lsl_guide.html b/linden/indra/newview/lsl_guide.html
index 33c2499..98b2c4c 100644
--- a/linden/indra/newview/lsl_guide.html
+++ b/linden/indra/newview/lsl_guide.html
@@ -3843,6 +3843,7 @@ talk_about_inventory(integer type)
            llSay(0, "No more inventory items");
            continue = FALSE;
        }
+        i++;
    } while(continue);
 }
      </PRE
@@ -15055,16 +15056,6 @@ HREF="#AEN5604"
 >.
    If <CODE
 CLASS="parameter"
-<<<<<<< .working
-=======
->linknumber</CODE
-> is <A
-HREF="#AEN5604"
->LINK_SET</A
->, set the alpha of
-    all objects in the linked set. If <CODE
-CLASS="parameter"
->>>>>>> .merge-right.r59207
 >face</CODE
 > is
    <A
@@ -15116,16 +15107,6 @@ HREF="#AEN5604"
 >.
    If <CODE
 CLASS="parameter"
-<<<<<<< .working
-=======
->linknumber</CODE
-> is <A
-HREF="#AEN5604"
->LINK_SET</A
->, set the color of
-    all objects in the linked set. If <CODE
-CLASS="parameter"
->>>>>>> .merge-right.r59207
 >face</CODE
 > is
    <A
@@ -15153,7 +15134,6 @@ NAME="AEN3915"
 ><CODE
 ><CODE
 CLASS="FUNCDEF"
-<<<<<<< .working
 >llSetLinkPrimitiveParams</CODE
 >(integer linknumber, list rules);</CODE
 ></P
@@ -15253,109 +15233,6 @@ NAME="AEN3950"
 ><CODE
 ><CODE
 CLASS="FUNCDEF"
-=======
->llSetLinkPrimitiveParams</CODE
->(integer linknumber, list rules);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the primitive parameters of the linked child
-    specified by <CODE
-CLASS="parameter"
->linknumber</CODE
->. A value of 0 means
-    no link, 1 the root, 2 for first child, etc. If
-    <CODE
-CLASS="parameter"
->linknumber</CODE
-> is <A
-HREF="#AEN5604"
->LINK_SET</A
->, set the primitive parameters
-    of all objects in the linked set. The <CODE
-CLASS="parameter"
->rules</CODE
->
-        list is identical to that of 
-        <A
-HREF="#AEN4008"
->llSetPrimitiveParams</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3929"
->A.235. llSetLinkTexture</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3931"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetLinkTexture</CODE
->(integer linknumber, string texture, integer face);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the <CODE
-CLASS="parameter"
->texture</CODE
-> of the linked child
-    specified by <CODE
-CLASS="parameter"
->linknumber</CODE
->. A value of 0 means
-    no link, 1 the root, 2 for first child, etc. If
-    <CODE
-CLASS="parameter"
->linknumber</CODE
-> is <A
-HREF="#AEN5604"
->LINK_SET</A
->, set the texture of
-    all objects in the linked set. If <CODE
-CLASS="parameter"
->face</CODE
-> is
-    <A
-HREF="#AEN6061"
->ALL_SIDES</A
->, set the texture
-    of all faces.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3948"
->A.236. llSetLocalRot</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3950"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->>>>>>> .merge-right.r59207
 >llSetLocalRot</CODE
 >(rotation rot);</CODE
 ></P
diff --git a/linden/indra/newview/macview.xcodeproj/project.pbxproj b/linden/indra/newview/macview.xcodeproj/project.pbxproj
index 669833e..0594224 100644
--- a/linden/indra/newview/macview.xcodeproj/project.pbxproj
+++ b/linden/indra/newview/macview.xcodeproj/project.pbxproj
@@ -585,6 +585,7 @@
                C1F5D0A50B138AEB00827F1D /* lluserrelations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C1F5D0A30B138AEB00827F1D /* lluserrelations.cpp */; };
                C64F673F0AFBED80009732B5 /* lllogchat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C64F673D0AFBED80009732B5 /* lllogchat.cpp */; };
                C64F67420AFBED91009732B5 /* lldirpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C64F67400AFBED91009732B5 /* lldirpicker.cpp */; };
+                D23289B50C453A3600304FEF /* llfloaterreleasemsg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D23289B30C453A3600304FEF /* llfloaterreleasemsg.cpp */; };
                D62830DB0B4DC76300F8830F /* llimagej2coj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D62830D80B4DC76300F8830F /* llimagej2coj.cpp */; };
                D645940C0B3B6D9000FAB68F /* libapr-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8764E09BEA39600AF6316 /* libapr-1.a */; };
                D645940D0B3B6D9A00FAB68F /* libaprutil-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD6C9A5209C773A000AA1849 /* libaprutil-1.a */; };
@@ -1132,6 +1133,7 @@
                26F52AD8051F61DF00A80050 /* llmenucommands.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmenucommands.cpp; sourceTree = SOURCE_ROOT; };
                26F52ADA051F61DF00A80050 /* llhudeffectpointat.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhudeffectpointat.cpp; sourceTree = SOURCE_ROOT; };
                26F52ADB051F61DF00A80050 /* llhudeffectlookat.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhudeffectlookat.cpp; sourceTree = SOURCE_ROOT; };
+                295542580C3B371500025801 /* llversionviewer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llversionviewer.h; sourceTree = "<group>"; };
                299F95BE0ADDE5D000C94EEF /* llviewquery.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewquery.cpp; sourceTree = "<group>"; };
                299F95BF0ADDE5D000C94EEF /* llviewquery.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewquery.h; sourceTree = "<group>"; };
                2E6FE90D09FD560A00AF02FF /* llpanelgroupnotices.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelgroupnotices.cpp; sourceTree = SOURCE_ROOT; };
@@ -1234,7 +1236,6 @@
                61922154074A9B58005E1F34 /* llsys.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsys.h; sourceTree = "<group>"; };
                61922155074A9B58005E1F34 /* lltimer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltimer.h; sourceTree = "<group>"; };
                61922158074A9B58005E1F34 /* lluuidhashmap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluuidhashmap.h; sourceTree = "<group>"; };
-                61922159074A9B58005E1F34 /* llversion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llversion.h; sourceTree = "<group>"; };
                6192215B074A9B58005E1F34 /* processor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = processor.h; sourceTree = "<group>"; };
                6192215C074A9B58005E1F34 /* stdenums.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = stdenums.h; sourceTree = "<group>"; };
                6192215D074A9B58005E1F34 /* stdtypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = stdtypes.h; sourceTree = "<group>"; };
@@ -1632,8 +1633,8 @@
                993A3E030B546D47007A0790 /* llvoiceclient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvoiceclient.h; sourceTree = "<group>"; };
                993A3E040B546D47007A0790 /* llvoiceclient.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvoiceclient.cpp; sourceTree = "<group>"; };
                994ADAE20A8016E500061DFB /* libllmozlib.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libllmozlib.dylib; path = "../../libraries/universal-darwin/lib_release/libllmozlib.dylib"; sourceTree = SOURCE_ROOT; };
-                9956CAFB0B96679C00F58C6D /* llprefsvoice.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llprefsvoice.h; sourceTree = "<group>"; };
+                9956CAFB0B96679C00F58C6D /* llprefsvoice.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = llprefsvoice.h; sourceTree = "<group>"; };
-                9956CAFC0B96679C00F58C6D /* llprefsvoice.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; path = llprefsvoice.cpp; sourceTree = "<group>"; };
+                9956CAFC0B96679C00F58C6D /* llprefsvoice.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; lineEnding = 0; path = llprefsvoice.cpp; sourceTree = "<group>"; };
                996209680B864D0E00392531 /* SLVoiceAgent.app */ = {isa = PBXFileReference; lastKnownFileType = wrapper.application; name = SLVoiceAgent.app; path = "vivox-runtime/universal-darwin/SLVoiceAgent.app"; sourceTree = SOURCE_ROOT; };
                9967E9090B37533F0087BD1B /* libfmodwrapper.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libfmodwrapper.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                9967E9520B37564D0087BD1B /* fmodwrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fmodwrapper.cpp; sourceTree = "<group>"; };
@@ -2012,6 +2013,9 @@
                C64F673E0AFBED80009732B5 /* lllogchat.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lllogchat.h; sourceTree = "<group>"; };
                C64F67400AFBED91009732B5 /* lldirpicker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldirpicker.cpp; sourceTree = "<group>"; };
                C64F67410AFBED91009732B5 /* lldirpicker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldirpicker.h; sourceTree = "<group>"; };
+                CB162DB40C6CCCFE00BF83BB /* llextendedstatus.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llextendedstatus.h; sourceTree = "<group>"; };
+                D23289B30C453A3600304FEF /* llfloaterreleasemsg.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterreleasemsg.cpp; sourceTree = "<group>"; };
+                D23289B40C453A3600304FEF /* llfloaterreleasemsg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterreleasemsg.h; sourceTree = "<group>"; };
                D62830D80B4DC76300F8830F /* llimagej2coj.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llimagej2coj.cpp; sourceTree = "<group>"; };
                D62830D90B4DC76300F8830F /* llimagej2coj.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimagej2coj.h; sourceTree = "<group>"; };
                D628315B0B4F3FA100F8830F /* llfont.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfont.cpp; sourceTree = "<group>"; };
@@ -2397,6 +2401,8 @@
                                993A3E040B546D47007A0790 /* llvoiceclient.cpp */,
                                ABD8702D0B3C68630007C63B /* llvoavatar.h */,
                                AB058FE40B3B74AD003C59D8 /* llvoicevisualizer.h */,
+                                D23289B30C453A3600304FEF /* llfloaterreleasemsg.cpp */,
+                                D23289B40C453A3600304FEF /* llfloaterreleasemsg.h */,
                                1A0DA5100C3AC07700361F49 /* llviewerjointmesh_vec.cpp */,
                                1A0DA5110C3AC07700361F49 /* llviewerjointmesh_sse2.cpp */,
                                1A0DA5120C3AC07700361F49 /* llviewerjointmesh_sse.cpp */,
@@ -2791,6 +2797,8 @@
                6192211E074A9B57005E1F34 /* llcommon */ = {
                        isa = PBXGroup;
                        children = (
+                                295542580C3B371500025801 /* llversionviewer.h */,
+                                CB162DB40C6CCCFE00BF83BB /* llextendedstatus.h */,
                                1A9897E70B98E2F4005C45D7 /* llbase32.h */,
                                1A9897E80B98E2F4005C45D7 /* llbase32.cpp */,
                                1A97C4540B8BCF9C00331A24 /* llliveappconfig.cpp */,
@@ -2910,7 +2918,6 @@
                                61922154074A9B58005E1F34 /* llsys.h */,
                                61922155074A9B58005E1F34 /* lltimer.h */,
                                61922158074A9B58005E1F34 /* lluuidhashmap.h */,
-                                61922159074A9B58005E1F34 /* llversion.h */,
                                99321B11081DD26000678159 /* llworkerthread.h */,
                                99321B12081DD26000678159 /* llworkerthread.cpp */,
                                6192215B074A9B58005E1F34 /* processor.h */,
@@ -4620,6 +4627,7 @@
                                1A0DA5140C3AC07800361F49 /* llviewerjointmesh_sse2.cpp in Sources */,
                                1A0DA5150C3AC07800361F49 /* llviewerjointmesh_sse.cpp in Sources */,
                                79256EA30C57D6A5000AAFA4 /* llfloatervoicewizard.cpp in Sources */,
+                                D23289B50C453A3600304FEF /* llfloaterreleasemsg.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
diff --git a/linden/indra/newview/newview.vcproj b/linden/indra/newview/newview.vcproj
index 199083f..1ae7f8b 100644
--- a/linden/indra/newview/newview.vcproj
+++ b/linden/indra/newview/newview.vcproj
@@ -577,6 +577,9 @@
                                RelativePath=".\llfloaterregioninfo.cpp">
                        </File>
                        <File
+                                RelativePath=".\llfloaterreleasemsg.cpp">
+                        </File>
+                        <File
                                RelativePath=".\llfloaterreporter.cpp">
                        </File>
                        <File
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 16eaa22..8e42504 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -498,7 +498,7 @@ public:
                {
                        for (LLSpatialGroup::draw_map_t::iterator i = group->mDrawMap.begin(); i != group->mDrawMap.end(); ++i)
                        {
-                                for (std::vector<LLDrawInfo*>::iterator j = i->second.begin(); j != i->second.end(); ++j)
+                                for (LLSpatialGroup::drawmap_elem_t::iterator j = i->second.begin(); j != i->second.end(); ++j) 
                                {
                                        LLDrawInfo* params = *j;
                                        if (mTextures.find(params->mTexture) != mTextures.end())
@@ -1651,10 +1651,10 @@ void LLPipeline::postSort(LLCamera& camera)
                }
                for (LLSpatialGroup::draw_map_t::iterator j = group->mDrawMap.begin(); j != group->mDrawMap.end(); ++j)
                {
-                        std::vector<LLDrawInfo*>& src_vec = j->second;
+                        LLSpatialGroup::drawmap_elem_t& src_vec = j->second;    
-                        std::vector<LLDrawInfo*>& dest_vec = mRenderMap[j->first];
+                        LLSpatialGroup::drawmap_elem_t& dest_vec = mRenderMap[j->first];  
-                        for (std::vector<LLDrawInfo*>::iterator k = src_vec.begin(); k != src_vec.end(); ++k)
+                        for (LLSpatialGroup::drawmap_elem_t::iterator k = src_vec.begin(); k != src_vec.end(); ++k) 
                        {
                                dest_vec.push_back(*k);
                        }
diff --git a/linden/indra/newview/pipeline.h b/linden/indra/newview/pipeline.h
index 218f920..06bfb73 100644
--- a/linden/indra/newview/pipeline.h
+++ b/linden/indra/newview/pipeline.h
@@ -393,7 +393,7 @@ public:
        LLVector3                               mSunDir;
        LLSpatialGroup::sg_vector_t mActiveGroups;
-        std::vector<LLDrawInfo*> mRenderMap[LLRenderPass::NUM_RENDER_TYPES];
+        LLSpatialGroup::drawmap_elem_t mRenderMap[LLRenderPass::NUM_RENDER_TYPES];      
        std::vector<LLSpatialGroup* > mAlphaGroups;
        std::vector<LLSpatialGroup* > mAlphaGroupsPostWater;
        LLSpatialGroup::sg_vector_t mVisibleGroups;
diff --git a/linden/indra/newview/prebuild.bat b/linden/indra/newview/prebuild.bat
index 139d810..ee714f5 100755
--- a/linden/indra/newview/prebuild.bat
+++ b/linden/indra/newview/prebuild.bat
@@ -1,13 +1,15 @@
-@echo off
+@echo off
-rem -- Check current message template against the master
+rem -- Check current message template against the master
-"../../scripts/template_verifier.py" --mode="development"
+"../../scripts/template_verifier.py" --mode="development"  --cache_master
 if errorlevel 1 goto BuildFailed
-goto end
+goto end
 :BuildFailed
 echo PREBUILD FAILED
-exit 1
+exit 1
-:end
+:end
-echo PREBUILD SUCCESSFUL
+echo PREBUILD SUCCESSFUL
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index 86f8c6d..f4d6a8a 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,11 +1,98 @@
-Release Notes for Second Life 1.18.2(1) September 19, 2007
+Release Notes for Second Life 1.18.3(2) August 27, 2007
 =====================================
 Changes:
-* Fix URL handler exploit described here: http://blog.secondlife.com/2007/09/18/second-life-url-handler-exploit/
+* Altered beacon behavior
-* Update voice components to improve quality and address VWR-1532
+** The beacon shaft is always drawn
-* Add name of viewer release channel to embedded browser agent ID string
+** The arrow is drawn if the lateral distance to the location being tracked is less than your view distance
+** The text appears if the total distance to the location being tracked is less than your view distance
+* Changed Bug Reporting links to http:// instead of https://
+* Build mode no longer automatically turns on beacons
+* Removed 'Ping User' in statistics window (was returning 0, as userserver no longer exists)
+* Removed 'Open' menu option when clothing is selected (as 'Wear' is available)
+* Added minimize button to Inventory
+LSL changes:
+* Ability to get details about an object by object key:
+** list llGetObjectDetails(key id, list params)
+*** id = the key of the object to get info about.
+*** params = a list of the object details requested: [OBJECT_NAME, OBJECT_OWNER]
+*** returns a list of values in the order requested: [ "Object_Name", <the UUID key of the owner>]
+**** OBJECT_UNKNOWN_DETAIL Returned by llGetObjectDetails when passed an invalid object parameter type.
+**** OBJECT_NAME Used with llGetObjectDetails to get an object's name.
+**** OBJECT_DESC Used with llGetObjectDetails to get an object's description.
+**** OBJECT_POS Used with llGetObjectDetails to get an object's position.
+**** OBJECT_ROT Used with llGetObjectDetails to get an object's rotation.
+**** OBJECT_VELOCITY Used with llGetObjectDetails to get an object's velocity.
+**** OBJECT_OWNER Used with llGetObjectDetails to get an object's owner's key. Will be NULL_KEY if group owned.
+**** OBJECT_GROUP Used with llGetObjectDetails to get an object's group's key.
+**** OBJECT_CREATOR Used with llGetObjectDetails to get an object's creator's key. 
+Bug fixes:
+* Fixed inworld map region search failing if a space is included after the region name
+* Fixed Appearance editor preview squares after changing tabs
+* Fixed a bug with LODs for sculpted prims
+* Fixed flexy causes llTargetOmega child objects to not rotate
+* Fixed an incorrect Support link
+* Fixed clipboard capture on login screen's config info
+* Fixed web browser widget shows up blank when connecting via https
+* Fixed doubleclicking text entry fields should select a single word first, then the entire field
+* Fixed items renamed from Recent Items not displaying the correct name in All Items
+* Fixed physical memory calls with more than 4GB of memory
+* Fixed viewer crash by clicking Connect button repeatedly
+* Fixed crash in viewer when receiving bad HUD Effects
+* Fixed a Linux client crash
+* Fixed client on 64-bit Linux systems that cannot find their GL drivers
+* Improved Linux client threading
+* Improved client performance after closing an inventory folder with a large number of items
+* CID-633: Possible string overflow (and generally lame code)
+* CID-634: Possible string overflow (and generally lame code)
+* CID-639: Possible use of uninitialized mouse co-ordinates
+* CID-641: LLToolGrab::onMouseCaptureLost() doesn't check that projectPosAgentToScreen succeeded
+* CID-698: LLFloaterTexturePicker::isDirty() is not correctly overriding ancestor
+* SVC-300: Spam upon TP out of Help Island Public, per calling card and landmark
+* VWR-1079: Group Notice dialog: message text can't be copied and pasted
+* VWR-1187: Profile > Classifieds tab shows confirmation dialog when no changes are made
+* VWR-1225: Embedded notecards not functioning
+* VWR-1230: Text highlighting in Chat History window is cancelled when history scrolls
+* VWR-1372: Sculpt prim topology reverts to sphere unexpectedly
+* VWR-1398: Appearance editor's previews do not render correctly (1.17.2)
+* VWR-1460: Can not see permissions of objects in Buy Contents window when item has long name
+* VWR-1564: Viewer crashes when started with the "-local" argument.
+* VWR-1566: An attempt to fix the glDrawRangeElements crashes (refcount LLDrawInfo )
+* VWR-1567: Change the default item name for "snapshot to inventory" to something more usefull than "snapshot"
+* VWR-1638: confused viewer - displays login and regular menus and buttons
+* VWR-1640: login retires cause LLFrameStatView::setup() to seg fault
+* VWR-1647: "Show end of last IM conversation" in Preferences/Communication automatically remains checked after OK-ing unchecked
+* VWR-1699: Sculpt map preview inaccurate
+* VWR-1714: Folders flashing in Inventory window with Filters and 'Always show folders' checked
+* VWR-1721: GUI quirk in groups
+* VWR-1722: Profiles are editable in two places (including Search browser)
+* VWR-1736: Add a Invite to Group option to the Avatar Pie Menu
+* VWR-1743: LLFloaterGroups source code inconsistencies
+* VWR-1761: Group Invite Suggestion--add 'view group info' to invite dialog box
+* VWR-1808: Possible crash in llviewerobjectlist
+* VWR-1823: Bad typecast for 64 bit systems, llagent llfloatercustomize
+* VWR-1861: Renaming items in inventory folders does not update item sort order
+* VWR-1872: An attempt to fix the "empty inventory trash" crashes
+* VWR-1880: Modify "Ctrl-F" to call Search/Replace Dialog when invoked inside Script Window
+* VWR-1891: Detect a Debian bulid-host, as is done for Fedora
+* VWR-1892: Use pkgconfig for more libraries in the standalone build
+* VWR-1942: An error in the do-while example of the LSL Scripting Guide could cause infinite looping.
+* VWR-1951: Hide Particles is not working from the View > Beacons menu item
+* VWR-1968: Possible crash in llmultigesture.cpp
+* VWR-1976: Solaris' fprintf segfaults on NULL arguments
+* VWR-1987: Segfault on startup if audio doesn't initialize.
+* VWR-2036: Build tools floater does not remember its position on restart
+* VWR-2144: Client crashes when deleting unsaved gestures
+* VWR-2152: Possible crash in llviewerobjectlist
+* VWR-240: Cannot input Japanese characters from keyboard on Linux
+* VWR-423: Selecting group charter text causes Apply/Ignore/Cancel popup even if the text wasn't changed
+* VWR-493: Objects with "Linden" in their name can't be muted
+* VWR-493: Statistics bar, Packet Loss: % sign is doubled
+* VWR-749: Bandwidth indicator: Kbps, should not have capital k
+* VWR-819: Open the "More>>" section of the edit tools by default and persist it across sessions
+* VWR-866: Sculpties suffer HORRIBLY from JPEG artifacts
+* VWR-942: logRanOffEndOfPacket is too terse when it logs packet data, add some more info
 Release Notes for Second Life 1.18.2(0) August 10, 2007
 =====================================
diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc
index e5f4f5d..78267b8 100644
--- a/linden/indra/newview/res/newViewRes.rc
+++ b/linden/indra/newview/res/newViewRes.rc
@@ -227,8 +227,8 @@ TOOLPIPETTE             CURSOR                  "toolpipette.cur"
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,18,2,1
+ FILEVERSION 1,18,3,2
- PRODUCTVERSION 1,18,2,1
+ PRODUCTVERSION 1,18,3,2
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -245,12 +245,12 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "Linden Lab"
            VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.18.2.1"
+            VALUE "FileVersion", "1.18.3.2"
            VALUE "InternalName", "Second Life"
            VALUE "LegalCopyright", "Copyright � 2001-2007, Linden Research, Inc."
            VALUE "OriginalFilename", "SecondLife.exe"
            VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.18.2.1"
+            VALUE "ProductVersion", "1.18.3.2"
        END
    END
    BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/secondlife setup build release candidate.bat b/linden/indra/newview/secondlife setup build release candidate.bat
new file mode 100644
index 0000000..e2bdbf3
--- /dev/null
+++ b/linden/indra/newview/secondlife setup build release candidate.bat
@@ -0,0 +1,4 @@
+@rem Invoke the script which preps then runs the installer.
+@rem This batch file is customized per grid.
+@"secondlife setup build.bat" --channel="Second Life Release Candidate"
diff --git a/linden/indra/newview/skins/textures/textures.xml b/linden/indra/newview/skins/textures/textures.xml
index 1c02ce4..ccf0834 100644
--- a/linden/indra/newview/skins/textures/textures.xml
+++ b/linden/indra/newview/skins/textures/textures.xml
@@ -394,6 +394,7 @@
        <oi_hud_mov_3_0.tga value="f5ff1f08-4c92-8606-1854-cc5b9d3e445c"/>
        <oi_hud_mov_1_2.tga value="1e3abeed-e893-c44e-1f9d-5ecc76d21e5d"/>
        <oi_hud_mov_1_0.tga value="e300fc95-aa94-8e31-c501-ce903cac8b7c"/>
+        <eng_lng_1_0.jpg value="5fcaac05-0677-b208-e715-983ebf01d16f"/>
        <circle.tga     value="0498c309-5306-43cd-82a2-ae31d096cdef"/>
        <mute_icon.tga value="37c8e000-6aa2-41ef-8f86-e0c2e60bfa42"/>
        <active_speakers.tga value="c97bdfb5-b0da-4741-877c-7c1553957d30"/>
diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index d294ae8..3030b78 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -3429,6 +3429,11 @@ spaceserver hiccup.
                        OK
                </option>
        </alert>
+        <alert modal="true" name="ProblemAddingEstateManager">
+                <message name="message">
+                        Problems adding a new estate manager.  One or more estates may have a full manager list.
+                </message>
+        </alert>
        <alert modal="true" name="UnableToLoadNotecard">
                <message name="message">
                        Unable to load notecard&apos;s asset at this time.
diff --git a/linden/indra/newview/skins/xui/en-us/floater_image_preview.xml b/linden/indra/newview/skins/xui/en-us/floater_image_preview.xml
index 2cea9e7..c54b5de 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_image_preview.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_image_preview.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="440" min_height="140" min_width="300"
+     can_resize="false" height="463" min_height="140" min_width="300"
     name="Image Preview" title="" width="300">
        <text bottom_delta="-40" follows="top|left" height="15" left="10" name="name_label">
                Name:
@@ -53,6 +53,10 @@ Unable to read image.
 Try saving image as 24 bit Targa (.tga).
        </text>
+    <check_box bottom="37" follows="bottom|left" enabled="false"
+         font="SansSerifSmall" height="16" initial_value="false"
+         label="Use lossless compression" left="10"
+         left_delta="2" name="lossless_check" control_name="LosslessJ2CUpload" width="280" />
        <button bottom="10" follows="bottom|right" height="20" label="Cancel" left="182"
             name="cancel_btn" width="64" />
        <button bottom="10" follows="bottom|left" height="20" label="Upload (L$[AMOUNT])"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
index ffed294..3b1cb87 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
@@ -1,4 +1,4 @@
-<floater bottom="-720" can_close="true" can_drag_on_left="false" can_minimize="false"
+<floater bottom="-720" can_close="true" can_drag_on_left="false" can_minimize="true"
     can_resize="true" height="563" hidden="false" left="882" min_height="150"
     min_width="240" mouse_opaque="true" name="Inventory"
     rect_control="FloaterInventoryRect" title="Inventory" width="467">
diff --git a/linden/indra/newview/skins/xui/en-us/floater_sim_release_message.xml b/linden/indra/newview/skins/xui/en-us/floater_sim_release_message.xml
new file mode 100644
index 0000000..5daa44b
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_sim_release_message.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
+     height="500" min_height="300" min_width="300" name="floaterreleasemessage"
+     title="Entering Region" width="700">
+        <button bottom="10" follows="bottom|right" font="SansSerifSmall" height="20"
+             label="Close" name="close_btn" right="-10" width="50" />
+        <web_browser bottom="40" follows="top|left|bottom|right" font="SansSerifSmall" left="15"
+             name="release_message_floater_browser" right="-15" top="-30" /> 
+        <text hidden="true" name="in-world_help_title">In-World Help</text>
+        <text hidden="true" name="in-world_help_url">
+                http://www.secondlife.com/app/support/inworld.html
+        </text>
+        <text hidden="true" name="additional_help_title">Additional Help</text>
+        <text hidden="true" name="additional_help_url">
+                http://www.secondlife.com/app/support/support.html
+        </text>
+</floater>
+\ No newline at end of file
diff --git a/linden/indra/newview/skins/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
index 305a5ef..edd84cc 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
@@ -855,10 +855,35 @@
                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
                             hidden="false" increment="0.1" initial_val="1" left_delta="73" max_val="4"
                             min_val="1" mouse_opaque="true" name="Revolutions" width="68" />
-           <texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
+            <texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
                 default_image_name="Default" follows="left|top" height="141" hidden="false"
                 label="Sculpt Texture" left="121" mouse_opaque="true" name="sculpt texture control"
-                 tool_tip="Click to choose a picture" width="141" />
+                 tool_tip="Click to choose a picture" width="141" visible="false"/>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" align="left" height="10" hidden="false"
+                             left="121" mouse_opaque="true" name="label sculpt type" v_pad="0" width="121" visible="false">
+                                 Stitching type
+                        </text>
+            <combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
+                 hidden="false" left="121" max_chars="20" mouse_opaque="true"
+                 name="sculpt type control" width="141" visible="false">
+                <combo_item name="None" value="None" hidden="false">
+                    (none)
+                </combo_item>
+                <combo_item name="Sphere" value="Sphere">
+                    Sphere
+                </combo_item>
+                <combo_item name="Torus" value="Torus">
+                    Torus
+                </combo_item>
+                <combo_item name="Plane" value="Plane">
+                    Plane
+                </combo_item>
+                <combo_item name="Cylinder" value="Cylinder">
+                    Cylinder
+                </combo_item>
+                        </combo_box>
                </panel>
                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
                     hidden="false" label="Features" left="1" mouse_opaque="false"
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml b/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml
index 91e27b7..b2280e2 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml
@@ -28,11 +28,14 @@
                        <on_click function="Avatar.Freeze" />
                        <on_enable function="Avatar.EnableFreezeEject" />
                </menu_item_call>
-                <menu_item_separator />
                <menu_item_call enabled="false" hidden="false" label="Give Card" mouse_opaque="true"
                     name="Give Card">
                        <on_click function="Avatar.GiveCard" />
                </menu_item_call>
+                <menu_item_call enabled="true" hidden="false" label="Group Invite..." mouse_opaque="true"
+                        name="Invite...">
+                        <on_click function="Avatar.InviteToGroup" />
+                </menu_item_call>
                <menu_item_separator />
                <menu_item_call enabled="false" hidden="false" label="Eject..." mouse_opaque="true"
                     name="Eject...">
diff --git a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
index 4d30c05..d1bcb05 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
@@ -820,19 +820,19 @@
                     label="Bug Reporting 101..." left="0" mouse_opaque="true"
                     name="Bug Reporing 101..." width="166">
                        <on_click function="PromptShowURL"
-                             userdata="WebLaunchBugReport101,https://wiki.secondlife.com/wiki/Bug_Reporting_101" />
+                             userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
                        </menu_item_call>
                        <menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
                     label="Security Issues..." left="0" mouse_opaque="true"
                     name="Security Issues..." width="166">
                        <on_click function="PromptShowURL"
-                             userdata="WebLaunchSecurityIssues,https://wiki.secondlife.com/wiki/Security_issues" />
+                             userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
                        </menu_item_call>
                        <menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
                     label="QA Wiki..." left="0" mouse_opaque="true"
                     name="QA Wiki..." width="166">
                        <on_click function="PromptShowURL"
-                             userdata="WebLaunchQAWiki,https://wiki.secondlife.com/wiki/QA_Portal" />
+                             userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
                        </menu_item_call>
                        <menu_item_separator bottom="-411" enabled="true" height="8" hidden="false" label="-----------"
                        left="0" mouse_opaque="true" name="separator7" width="250" />
@@ -840,13 +840,13 @@
                     label="Public Issue Tracker..." left="0" mouse_opaque="true"
                     name="Public Issue Tracker..." width="166">
                        <on_click function="PromptShowURL"
-                             userdata="WebLaunchPublicIssue,https://jira.secondlife.com" />
+                             userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
                        </menu_item_call>
                        <menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
                     label="Public Issue Tracker Help..." left="0" mouse_opaque="true"
                     name="Publc Issue Tracker Help..." width="166">
                        <on_click function="PromptShowURL"
-                             userdata="WebLaunchPublicIssueHelp,https://wiki.secondlife.com/wiki/Issue_tracker" />
+                             userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
                        </menu_item_call>
                </menu>
        </menu>
diff --git a/linden/indra/newview/skins/xui/en-us/notify.xml b/linden/indra/newview/skins/xui/en-us/notify.xml
index b21325e..f4de3f1 100644
--- a/linden/indra/newview/skins/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/xui/en-us/notify.xml
@@ -233,13 +233,13 @@ Please select a single object.
        </notify>
        <notify name="TeleportToLandmark" tip="true">
                <message name="message">
-                        Now that you have reached the mainland, you can teleport to the location &apos;[NAME]&apos; by clicking on the Inventory button on the bottom right of your screen, and then select the Landmarks folder.
+                        Now that you have reached the mainland, you can teleport to locations like &apos;[NAME]&apos; by clicking on the Inventory button on the bottom right of your screen, and then select the Landmarks folder.
 Double click on the landmark and click on Teleport to travel there.
                </message>
        </notify>
        <notify name="TeleportToPerson" tip="true">
                <message name="message">
-                        Now that you have reached the mainland, you can contact the resident &apos;[NAME]&apos; by clicking on the Inventory button on the bottom right of your screen, and then select the Calling Cards folder.
+                        Now that you have reached the mainland, you can contact residents like &apos;[NAME]&apos; by clicking on the Inventory button on the bottom right of your screen, and then select the Calling Cards folder.
 Double click on the card, click on Instant Message, and type a message.
                </message>
        </notify>
@@ -481,6 +481,9 @@ No scripts will run except those belonging to the land owner.
                <option name="Decline">
                        Decline
                </option>
+                <option name="Info">
+                        Info
+                </option>
        </notify>
        <notify name="JoinGroupOfficerNoFee" tip="false">
                <message name="message">
@@ -496,6 +499,9 @@ There is no cost to join this group.
                <option name="Decline">
                        Decline
                </option>
+                <option name="Info">
+                        Info
+                </option>
        </notify>
        <notify name="JoinGroupMember" tip="false">
                <message name="message">
@@ -511,6 +517,9 @@ To join this group, you will have to pay a signup fee of L$[COST]
                <option name="Decline">
                        Decline
                </option>
+                <option name="Info">
+                        Info
+                </option>
        </notify>
        <notify name="JoinGroupMemberNoFee" tip="false">
                <message name="message">
@@ -526,6 +535,9 @@ There is no cost to join this group.
                <option name="Decline">
                        Decline
                </option>
+                <option name="Info">
+                        Info
+                </option>
        </notify>
        <notify name="OfferTeleport" tip="false">
                <message name="message">
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml b/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml
index e369da9..3463880 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml
@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="false" bottom="0" height="380" label="Invite a Member" left="0"
     name="invite_panel" select="false" width="210">
-        <text bottom_delta="-78" height="54" left="7" width="200">
+        <text bottom_delta="-44" follows="left|top" font="SansSerifSmall" height="20"
+                left="7" name="group_name_lbl" width="40">
+                Group:
+        </text>
+        <text bg_readonly_color="clear" bottom_delta="0" follows="left|top"
+                         font="SansSerifSmall" height="20" left="50" name="group_name_text"
+                         text_readonly_color="white" width="150">
+                (unknown)
+        </text>
+        <text bottom_delta="-50" height="54" left="7" width="200">
                You can select multiple residents to 
-invite to your group. Click &apos;Open 
+invite to your group. Click &apos;Open
 Person Chooser&apos; to start.
        </text>
-        <button bottom_delta="-10" font="SansSerifSmall" halign="center" height="20"
+        <button bottom_delta="-12" font="SansSerifSmall" halign="center" height="20"
-             label="Open Person Chooser" left="5" name="add_button" tool_tip=""
+                 label="Open Person Chooser" left="5" name="add_button" tool_tip=""
-             width="200" />
+                 width="200" />
-        <name_list allow_calling_card_drop="true" background_visible="true" bottom_delta="-193"
+        <name_list allow_calling_card_drop="true" background_visible="true" bottom_delta="-183"
-             column_padding="0" draw_border="true" fg_disable_color="grey"
+                 column_padding="0" draw_border="true" fg_disable_color="grey"
-             fg_selected_color="black" fg_unselected_color="black" height="189" left="5"
+                 fg_selected_color="black" fg_unselected_color="black" height="169" left="5"
-             multi_select="true" name="invitee_list"
+                 multi_select="true" name="invitee_list"
-             tool_tip="Hold the Ctrl key and click resident names  to multi-select."
+                 tool_tip="Hold the Ctrl key and click resident names  to multi-select."
-             width="200" />
+                 width="200" /> 
        <button bottom_delta="-24" font="SansSerifSmall" halign="center" height="20"
             label="Remove Selected from List" left_delta="0" name="remove_button"
             tool_tip="Removes residents selected above from the invite list."
diff --git a/linden/indra/newview/viewer.cpp b/linden/indra/newview/viewer.cpp
index 69e98f4..d42872d 100644
--- a/linden/indra/newview/viewer.cpp
+++ b/linden/indra/newview/viewer.cpp
@@ -138,7 +138,7 @@
 #include "llmemtype.h"
 #include "llmd5.h"
 #include "llsecondlifeurls.h"
-#include "llversion.h"
+#include "llversionviewer.h"
 #include "llvfile.h"
 #include "llvfs.h"
 #include "llwindow.h"           // for shell_open
@@ -296,8 +296,6 @@ std::string gSerialNumber;
 // Application constants
 /////////////////////////////////////////////////////////////////////////////////
-S32 gStartupState = STATE_FIRST;
 BOOL gAgentMovementCompleted = FALSE;
 BOOL gHaveSavedSnapshot = FALSE;
@@ -391,7 +389,6 @@ BOOL				gPrintMessagesThisFrame = FALSE;
 const char*                     DEFAULT_SETTINGS_FILE = "settings.xml";
 const char*                     LEGACY_DEFAULT_SETTINGS_FILE = "settings.ini";
 BOOL                            gUseWireframe = FALSE;
-BOOL                            gRunLocal = FALSE;
 LLUUID                          gViewerDigest;  // MD5 digest of the viewer's executable file.
 LLPumpIO*                       gServicePump = NULL;
 S32                                     gNumSessions = 0;
@@ -468,6 +465,8 @@ BOOL gPacificDaylightTime = FALSE;
 U32     gSecondsPerDay = 0;
 U32     gSecondsPerYear = 0;
+LLString gLastVersionChannel;
 //
 // Region/Object globals
 //
@@ -513,7 +512,6 @@ static const char USAGE[] = "\n"
 " -user <user_server_ip>               specify userserver in dotted quad\n"
 #if !LL_RELEASE_FOR_DOWNLOAD
 " -sim <simulator_ip>                  specify the simulator ip address\n"
-" -local                               run without simulator\n"
 #endif
 " -god                                     log in as god if you have god access\n"
 " -purge                               delete files in cache\n"
@@ -543,13 +541,12 @@ BOOL gGodConnect = FALSE;
 BOOL gUseConsole = TRUE;
 BOOL gUseAudio = TRUE;
 BOOL gUseFMOD = TRUE;
-BOOL gConnectToSomething = TRUE;
 BOOL gLogMessages = FALSE;
 BOOL gRequestInventoryLibrary = TRUE;
 BOOL gAcceptTOS = FALSE;
 BOOL gAcceptCriticalMessage = FALSE;
 // this is the channel the viewer uses to check for updates/login
-std::string gChannelName = "Second Life Release";
+std::string gChannelName = LL_CHANNEL;
 LLUUID gInventoryLibraryOwner;
 LLUUID gInventoryLibraryRoot;
@@ -629,7 +626,7 @@ void main_loop();
 //
 // Callbacks and other stuff that's not directly used in main
 //
-void uuid_table_request_file_callback(void **user_data, S32 result);
+void uuid_table_request_file_callback(void **user_data, S32 result, LLExtStat ext_status);
 void send_stats();
 //
@@ -808,6 +805,11 @@ int main( int argc, char **argv )
 #if LL_SOLARIS && defined(__sparc)
        asm ("ta\t6");           // NOTE:  Make sure memory alignment is enforced on SPARC
 #endif
+#if LL_DARWIN
+        // Set the working dir to <bundle>/Contents/Resources
+        (void) chdir(gDirUtilp->getAppRODataDir().c_str());
+#endif
        
 #if 1
        // This will eventually be done in LLApp
@@ -944,6 +946,10 @@ int main( int argc, char **argv )
                        // May need to know this early also
                        gDisableVoice = TRUE;
                }
+                else if (!strcmp(argv[j], "-url") && (++j < argc)) 
+                {
+                        LLURLSimString::setString(argv[j]);
+                }
        }
        if (!strcmp(gUserServerName, gUserServerDomainName[USERSERVER_AGNI].mName))
@@ -1347,7 +1353,6 @@ int main( int argc, char **argv )
        if ( nextLoginLocation.length() )
        {
                LLURLSimString::setString( nextLoginLocation.c_str() );
-                gConnectToSomething = TRUE;
        };
        // Merge with the command line overrides
@@ -1853,7 +1858,7 @@ void main_loop()
                                if (gViewerWindow->mWindow->getVisible() 
                                        && gViewerWindow->getActive()
                                        && !gViewerWindow->mWindow->getMinimized()
-                                        && gStartupState == STATE_STARTED
+                                        && LLStartUp::getStartupState() == STATE_STARTED
                                        && !gViewerWindow->getShowProgress()
                                        && !gFocusMgr.focusLocked())
                                {
@@ -1871,7 +1876,7 @@ void main_loop()
                                        gServicePump->callback();
                                }
-                                if (gDoDisconnect && (gStartupState == STATE_STARTED))
+                                if (gDoDisconnect && (LLStartUp::getStartupState() == STATE_STARTED))
                                {
                                        save_final_snapshot(NULL);
                                        disconnect_viewer(NULL);
@@ -1981,7 +1986,7 @@ void main_loop()
        }
        // Save snapshot for next time, if we made it through initialization
-        if (STATE_STARTED == gStartupState)
+        if (STATE_STARTED == LLStartUp::getStartupState())
        {
                save_final_snapshot(NULL);
        }
@@ -2023,7 +2028,7 @@ void process_keystrokes_async()
        if (gViewerWindow->mWindow->getVisible() 
                && gViewerWindow->getActive()
                && !gViewerWindow->mWindow->getMinimized()
-                && gStartupState == STATE_STARTED
+                && LLStartUp::getStartupState() == STATE_STARTED
                && !gViewerWindow->getShowProgress()
                && !gFocusMgr.focusLocked())
        {
@@ -2196,7 +2201,7 @@ void write_system_info()
        write_debug(gSysCPU.getCPUString());
        write_debug("\n");
        
-        tmp_str = llformat("RAM: %u\n", gSysMemory.getPhysicalMemory());
+        tmp_str = llformat("RAM: %u KB\n", gSysMemory.getPhysicalMemoryKB());
        write_debug(tmp_str.c_str());
        write_debug("OS: ");
        write_debug(gSysOS.getOSString().c_str());
@@ -2951,7 +2956,6 @@ OSErr AEGURLHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn)
                // Parse it and stash in globals.
                LLURLSimString::setString(buffer);
-                gConnectToSomething = TRUE;
                
                if(gFloaterWorldMap != NULL)
                {
@@ -3192,12 +3196,11 @@ void save_final_snapshot(void*)
                gAgent.changeCameraToThirdPerson( FALSE );      // don't animate, need immediate switch
                gSavedSettings.setBOOL("ShowParcelOwners", FALSE);
                idle();
-                char temp_str[MAX_PATH];                /* Flawfinder: ignore */
-                strncpy (temp_str,gDirUtilp->getLindenUserDir().c_str(), MAX_PATH -1);          /* Flawfinder: ignore */
+                LLString snap_filename = gDirUtilp->getLindenUserDir();
-                temp_str[MAX_PATH -1] = '\0';
+                snap_filename += gDirUtilp->getDirDelimiter();
-                strcat (temp_str,"/");          /* Flawfinder: ignore */
+                snap_filename += SCREEN_LAST_FILENAME;
-                strcat (temp_str,SCREEN_LAST_FILENAME);         /* Flawfinder: ignore */
+                gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidth(), gViewerWindow->getWindowHeight(), FALSE, TRUE);
-                gViewerWindow->saveSnapshot(temp_str, gViewerWindow->getWindowWidth(), gViewerWindow->getWindowHeight(), FALSE, TRUE);
                gHaveSavedSnapshot = TRUE;
        }
 }
@@ -3239,7 +3242,7 @@ void app_request_quit()
        LLViewerRegion* region = gAgent.getRegion();
        
-        if( (gStartupState < STATE_STARTED) || !region )
+        if( (LLStartUp::getStartupState() < STATE_STARTED) || !region )
        {
                // Quit immediately
                app_force_quit(NULL);
@@ -3495,7 +3498,7 @@ void idle_network()
        gObjectList.mNumNewObjects = 0;
        S32 total_decoded = 0;
-        if (!gSavedSettings.getBOOL("SpeedTest") && !gRunLocal)
+        if (!gSavedSettings.getBOOL("SpeedTest"))
        {
                LLFastTimer t(LLFastTimer::FTM_IDLE_NETWORK); // decode
                
@@ -3663,7 +3666,7 @@ void idle()
        // Special case idle if still starting up
        //
-        if (gStartupState < STATE_STARTED)
+        if (LLStartUp::getStartupState() < STATE_STARTED)
        {
                // Skip rest if idle startup returns false (essentially, no world yet)
                if (!idle_startup())
@@ -4004,13 +4007,13 @@ void idle()
        {
                gFrameStats.start(LLFrameStats::AUDIO);
                LLFastTimer t(LLFastTimer::FTM_AUDIO_UPDATE);
-                audio_update_volume(false);
-                audio_update_listener();
-                audio_update_wind(false);
                
                if (gAudiop)
                {
+                        audio_update_volume(false);
+                        audio_update_listener();
+                        audio_update_wind(false);
                        // this line actually commits the changes we've made to source positions, etc.
                        const F32 max_audio_decode_time = 0.002f; // 2 ms decode time
                        gAudiop->idle(max_audio_decode_time);
@@ -5192,7 +5195,7 @@ void send_stats()
        gMessageSystem->addF32Fast(_PREHASH_Ping, gAvgSimPing);
        gMessageSystem->addF64Fast(_PREHASH_MetersTraveled, gAgent.getDistanceTraveled());
        gMessageSystem->addS32Fast(_PREHASH_RegionsVisited, gAgent.getRegionsVisited());
-        gMessageSystem->addU32Fast(_PREHASH_SysRAM, gSysMemory.getPhysicalMemory());
+        gMessageSystem->addU32Fast(_PREHASH_SysRAM, gSysMemory.getPhysicalMemoryClamped());
        gMessageSystem->addStringFast(_PREHASH_SysOS, gSysOS.getOSString());
        gMessageSystem->addStringFast(_PREHASH_SysCPU, gSysCPU.getCPUString());
@@ -5341,13 +5344,18 @@ int parse_args(int argc, char **argv)
        // Sometimes IP addresses passed in on the command line have leading
        // or trailing white space.  Use LLString to clean that up.
        LLString ip_string;
        S32 j;
+        // agent_sim_host holds the settings for connecting to the first simulator.
-        for (j = 1; j < argc; j++) 
+        for (j = 1; j < argc; j++)
        {
                gArgs += argv[j];
                gArgs += " ";
+        }
+        for (j = 1; j < argc; j++) 
+        {
                LLString argument = argv[j];
                if ((!strcmp(argv[j], "-port")) && (++j < argc)) 
                {
@@ -5369,61 +5377,51 @@ int parse_args(int argc, char **argv)
                {
                        gUserServerChoice = USERSERVER_ADITI;
                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[gUserServerChoice].mName);            /* Flawfinder: ignore */
-                        gConnectToSomething = TRUE;
                }
                else if (!strcmp(argv[j], "--agni"))
                {
                        gUserServerChoice = USERSERVER_AGNI;
                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[gUserServerChoice].mName);            /* Flawfinder: ignore */
-                        gConnectToSomething = TRUE;
                }
                else if (!strcmp(argv[j], "--dmz"))
                {
                        gUserServerChoice = USERSERVER_DMZ;
                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[gUserServerChoice].mName);            /* Flawfinder: ignore */
-                        gConnectToSomething = TRUE;
                }
                else if (!strcmp(argv[j], "--siva"))
                {
                        gUserServerChoice = USERSERVER_SIVA;
                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[gUserServerChoice].mName);            /* Flawfinder: ignore */
-                        gConnectToSomething = TRUE;
                }
                else if (!strcmp(argv[j], "--shakti"))
                {
                        gUserServerChoice = USERSERVER_SHAKTI;
                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[gUserServerChoice].mName);            /* Flawfinder: ignore */
-                        gConnectToSomething = TRUE;
                }
                else if (!strcmp(argv[j], "--durga"))
                {
                        gUserServerChoice = USERSERVER_DURGA;
                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[gUserServerChoice].mName);            /* Flawfinder: ignore */
-                        gConnectToSomething = TRUE;
                }
                else if (!strcmp(argv[j], "--soma"))
                {
                        gUserServerChoice = USERSERVER_SOMA;
                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[gUserServerChoice].mName);            /* Flawfinder: ignore */
-                        gConnectToSomething = TRUE;
                }
                else if (!strcmp(argv[j], "--ganga"))
                {
                        gUserServerChoice = USERSERVER_GANGA;
                        sprintf(gUserServerName,"%s", gUserServerDomainName[gUserServerChoice].mName);
-                        gConnectToSomething = TRUE;
                }
                else if (!strcmp(argv[j], "--vaak"))
                {
                        gUserServerChoice = USERSERVER_VAAK;
                        sprintf(gUserServerName,"%s", gUserServerDomainName[gUserServerChoice].mName);
-                        gConnectToSomething = TRUE;
                }
                else if (!strcmp(argv[j], "--uma"))
                {
                        gUserServerChoice = USERSERVER_UMA;
                        sprintf(gUserServerName,"%s", gUserServerDomainName[gUserServerChoice].mName);
-                        gConnectToSomething = TRUE;
                }
                else if (!strcmp(argv[j], "-user") && (++j < argc)) 
                {
@@ -5439,7 +5437,6 @@ int parse_args(int argc, char **argv)
                                LLString::trim(ip_string);
                                snprintf(gUserServerName, MAX_STRING, "%s", ip_string.c_str());         /* Flawfinder: ignore */
                        }
-                        gConnectToSomething = TRUE;
                }
                else if (!strcmp(argv[j], "-loginuri") && (++j < argc))
                {
@@ -5509,11 +5506,6 @@ int parse_args(int argc, char **argv)
                {
                        purge_cache();
                }
-                else if (!strcmp(argv[j], "-local"))
-                {
-                        gConnectToSomething = FALSE;
-                        gRunLocal = TRUE;
-                }
                else if(!strcmp(argv[j], "-noinvlib"))
                {
                        gRequestInventoryLibrary = FALSE;
@@ -5621,25 +5613,11 @@ int parse_args(int argc, char **argv)
                // so this allows us to parse the URL straight off the command line without a "-url" paramater
                else if (!argument.compare(0, std::string( "secondlife://" ).length(), std::string("secondlife://")))
                {
-                        // *NOTE: After setting the url, bail. What can happen is
-                        // that someone can use IE (or potentially other browsers)
-                        // and do the rough equivalent of command injection and
-                        // steal passwords. Phoenix. SL-55321
                        LLURLSimString::setString(argv[j]);
-                        gConnectToSomething = TRUE;
-                        gArgs += argv[j];
-                        return 0;
                }
                else if (!strcmp(argv[j], "-url") && (++j < argc)) 
                {
-                        // *NOTE: After setting the url, bail. What can happen is
-                        // that someone can use IE (or potentially other browsers)
-                        // and do the rough equivalent of command injection and
-                        // steal passwords. Phoenix. SL-55321
                        LLURLSimString::setString(argv[j]);
-                        gConnectToSomething = TRUE;
-                        gArgs += argv[j];
-                        return 0;
                }
                else if (!strcmp(argv[j], "-ignorepixeldepth"))
                {
@@ -6024,7 +6002,7 @@ void do_disconnect(const LLString& mesg)
    }
        
        //RN: just quit if we haven't logged in
-        if (gStartupState < STATE_STARTED)
+        if (LLStartUp::getStartupState() < STATE_STARTED)
        {
                finish_disconnect(1, NULL);
                return;
diff --git a/linden/indra/newview/viewer.h b/linden/indra/newview/viewer.h
index ef975e7..e6392f5 100644
--- a/linden/indra/newview/viewer.h
+++ b/linden/indra/newview/viewer.h
@@ -77,9 +77,7 @@ extern LLMemoryInfo gSysMemory;
 extern BOOL gLogMessages;
 extern BOOL gUseAudio;
 extern bool gPreloadImages;
-extern BOOL gConnectToSomething;
 extern BOOL gGodConnect;
-extern BOOL gRunLocal;
 extern LLString gCmdLineFirstName;
 extern LLString gCmdLineLastName;
 extern LLString gCmdLinePassword;
@@ -117,6 +115,8 @@ extern U32		gSecondsPerYear;
 // currently in daylight savings time?
 extern BOOL gPacificDaylightTime;
+extern LLString gLastVersionChannel;
 extern LLVector3 gWindVec;
 extern LLVector3 gRelativeWindVec;
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index ecbeda2..3641bcf 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -402,8 +402,9 @@ class DarwinManifest(ViewerManifest):
                # make sure we don't have stale files laying about
                self.remove(sparsename, finalname)
-                self.run_command('hdiutil create "%(sparse)s" -volname "Second Life" -fs HFS+ -type SPARSE -megabytes 300' % {
+                self.run_command('hdiutil create "%(sparse)s" -volname "%(channel)s" -fs HFS+ -type SPARSE -megabytes 300' % {
-                        'sparse':sparsename})
+                        'sparse':sparsename,
+                        'channel':channel_standin})
                # mount the image and get the name of the mount point and device node
                hdi_output = self.run_command('hdiutil attach -private "' + sparsename + '"')
@@ -459,9 +460,12 @@ class LinuxManifest(ViewerManifest):
                if(self.args.has_key('installer_name')):
                        installer_name = self.args['installer_name']
                else:
-                        installer_name = '_'.join(['SecondLife', self.args.get('arch'), '_'.join(self.args['version'])])
+                        installer_name = '_'.join('SecondLife_', self.args.get('arch'), *self.args['version'])
-                        if not self.default_grid():
+                        if self.default_channel():
-                                installer_name += "_" + grid.upper()
+                                if not self.default_grid():
+                                        installer_name += '_' + self.args['grid'].upper()
+                        else:
+                                installer_name += '_' + self.channel_oneword().upper()
                # temporarily move directory tree so that it has the right name in the tarfile
                self.run_command("mv %(dst)s %(inst)s" % {'dst':self.get_dst_prefix(),'inst':self.src_path_of(installer_name)})
@@ -503,7 +507,7 @@ class Linux_i686Manifest(LinuxManifest):
                        self.path("libuuid.so", "libuuid.so.1")
                        self.path("libSDL-1.2.so.0")
                        self.path("libELFIO.so")
-                        #self.path("libresolv.so") - don't bundle
+                        self.path("libresolv.so", "libresolv.so.2")
                        #self.path("libtcmalloc.so.0") - bugged
                        #self.path("libstacktrace.so.0") - probably bugged
 #                        self.path("libllkdu.so", "../bin/libllkdu.so") # llkdu goes in bin for some reason