40 files changed, 667 insertions, 343 deletions

diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 837c0f0..21611bd 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -4,6 +4,208 @@
 
 
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  =-                       1.3.0 RC1                        -=
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+
+    RELEASE HIGHLIGHTS
+
+      * Fixed many frequent crashes and memory leaks. You should
+        notice significantly improved viewer stability in this
+        version. Many thanks to our Weeklies testers and everyone else
+        who helped us find and fix these issues!
+
+      * Area Object Search: You can now search for objects in the
+        nearby area by name, description, creator, and/or group name.
+        Thanks to the Emerald Viewer and Henri Beauchamp for this
+        feature.
+
+      * The actions on the Minimap Radar "Estate" tab now work for
+        parcel owners too. Thanks, McCabe!
+
+      * Fixed a long-standing typo that made the object cache useless
+        (SNOW-783). Second Life scenes will now rez much more quickly
+        when visiting them again. (OpenSim does not currently support
+        object caches.) Thanks to Andrew Linden for the tip-off.
+
+      * Other new features: copy worn attachments, MU*-style poses,
+        OOC auto-close, Shift-Enter to whisper, revamped LightShare
+        support, and more. Read on for details!
+
+
+    KNOWN ISSUES
+
+      * Certain audio streams and movies don't play audio, e.g.
+        YouTube MP4 videos. The viewer does not currently include the
+        necessary plugin to play the AAC audio format. We hope to
+        resolve this for the 1.3.0 final release.
+
+      * The viewer does not properly detect the LLKDU image library on
+        some systems. We are investigating this issue.
+
+      * The "Cancel" button is missing when the teleport screen is
+        disabled.
+
+      * The Animation Override window needs to be open when standing
+        up from sitting on the ground in order to activate stands.
+
+      * Tiny prims are sometimes invisible until selected.
+
+
+    CHANGES
+
+      In addition to the Release Highlights above, this version of
+      Imprudence also includes the following changes, as compared to
+      Imprudence 1.3.0 beta 5.
+
+
+      FEATURES / IMPROVEMENTS
+
+        * Re-enabled the ability to copy worn attachments in the
+          inventory window. Thanks to Henri Beauchamp for the patch!
+
+        * Added optional support for MU*-style poses (":" works like
+          "/me") and OOC auto-close (automatically close "((" in
+          chat). You can enable these features in "Preferences >
+          Advanced". Thanks to Henri Beauchamp for these features!
+
+        * You can now choose a clock/timestamp format in
+          "Preferences > General": 12-hour PST/PDT, 24-hour PST/PDT,
+          or UTC. Thanks, McCabe!
+
+        * You can now whisper in chat by pressing Shift-Enter instead
+          of Enter. Thanks to Henri Beauchamp for this feature!
+
+        * The viewer now plays in-world sound effects regardless of
+          the maturity rating of the sim. Thanks, McCabe!
+
+        * The Map window will now let you teleport up to the maximum Z
+          value allowed by the grid (it was limited to 4096 meters
+          before). Thanks, McCabe!
+
+        * Likewise, the minimap maximum zoom-out level is now based on
+          the maximum Z value allowed by the grid. Thanks, McCabe!
+
+        * Added menu entries to take off alpha and tattoo layers (in
+          the Edit menu and pie menus). Thanks, McCabe!
+
+        * Revamped LightShare support. Please see our LightShare wiki
+          page for more information about this feature. Thanks, Jacek!
+
+           - More fine-grained LightShare permission control in
+             "Preferences > Advanced".
+
+           - Teleporting will no longer reset Windlight to the default
+             settings.
+
+           - Added the new OpenSim 0.7 names for the LightShare script
+             functions (prefixed with "ls" instead of "cm") to the
+             script editor. Thanks, McCabe!
+
+        * Increased the maximum building grid size from 50m to 10,000m
+          in Advanced Build Options. Thanks, McCabe!
+
+        * Added "Advanced > Character > Private Point At" to disable
+          telling other viewers where you avatar is pointing (similar
+          to Private Look At).
+
+        * The Script Warning/Error window now has timestamps. Thanks,
+          Jacek!
+
+        * The viewer now automatically enables joystick support on
+          Windows and Linux if a joystick is present. You can disable
+          this by setting the JoystickAutoEnable debug setting to
+          FALSE. Thanks, Armin!
+
+           - Auto-enable is not available on Mac, due to an issue with
+             some mice being detected as joysticks. Mac users can still
+             manually enable joystick support in "Preferences > Input &
+             Camera > Joystick Setup".
+
+        * Added "Advanced > Debug Settings" to the login screen menu.
+
+        * Added a "File" menu to the notecard editor, with "Save",
+          "Import Text", and "Export Text" entries. Thanks, McCabe!
+
+        * Improved viewer framerate slightly by setting the inventory
+          window title more efficiently. Thanks, Armin!
+
+        * Added a "Select a Default Grid" popup the first time you run
+          Imprudence, to help users connect to the grid they want.
+          Thanks, McCabe!
+
+        * You can now access the Grid Manager at any time via
+          "Preferences > General". Thanks, McCabe!
+
+        * Cosmetic UI cleanup in the Advanced Build Options window,
+          pie menus, login screen, grid manager, event search tab, and
+          some notifications. Thanks, McCabe!
+
+        * Tidied up the Advanced menu a bit. Thanks, McCabe!
+
+        * "Limit Select Distance" has been moved from the Advanced
+          menu to the Advanced Build Options window.
+
+        * Renamed "Help > Viewer Help" to "Help > Grid Help" to match
+          what it does. Thanks, McCabe!
+
+        * The chat log timestamp now has a leading zero for hours less
+          than 10 (SNOW-629). Thanks to Ardy Lay for the patch!
+
+
+      BUG FIXES
+
+        * Fixed a nasty crash "LLRefCount: deleting non-zero
+          reference" (#293). Thanks, McCabe!
+
+        * Fixed a crash when http-getting an empty texture (SNOW-698).
+          Thanks for the patch, Thickbrick Sleaford!
+
+        * Fixed a crash when using a custom viewer skin that is
+          missing some color definitions. Thanks to the Emerald Viewer
+          for this fix.
+
+        * Fixed a crash in LLPanelPlace::onClickTeleport (#357).
+          Thanks, McCabe!
+
+        * Fixed several memory leaks. Thanks to Linden Lab and the
+          Emerald Viewer.
+
+        * Fixed the Animation Overrider not playing stand animations
+          after standing up from sitting on an object. (But, it still
+          affects standing up from the ground.) Thanks, McCabe!
+
+        * Fixed your avatar's eyes looking in a weird direction when
+          "Advanced > Character > Private Look At" is enabled. Thanks,
+          Armin!
+
+        * Fixed the "View > Web Browser" menu item not doing anything.
+          Thanks, McCabe!
+
+        * Fixed several Mac compile issues. Thanks, Jacek!
+
+        * When unable to connect, the error message now says the grid
+          name, instead of "Unable to connect to Imprudence". Thanks,
+          McCabe!
+
+        * Fixed chat logs potentially being saved to invalid
+          filenames. Thanks to the Emerald Viewer for this fix.
+
+        * Fixed a crash when trying to use a landmark after logging
+          out. Thanks, Armin!
+
+        * Reduced stuttering and lag in the audio engine. Thanks for
+          the patch, Henri Beauchamp!
+
+        * Fixed the Web Browser window missing its "Home" button.
+          Thanks, McCabe!
+
+        * Fixed the main menu disappearing when the "You have been
+          logged out" alert appears (#327). Thanks, McCabe!
+
+
+
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   =-                     1.3.0 BETA 5                       -=
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
diff --git a/linden/indra/llaudio/audioengine.h b/linden/indra/llaudio/audioengine.h
index e990eb7..e46091c 100644
--- a/linden/indra/llaudio/audioengine.h
+++ b/linden/indra/llaudio/audioengine.h
@@ -93,7 +93,8 @@ public:
                 AUDIO_TYPE_SFX     = 1,
                 AUDIO_TYPE_UI      = 2,
                 AUDIO_TYPE_AMBIENT = 3,
-                AUDIO_TYPE_COUNT   = 4 // last
+                AUDIO_TYPE_GESTURE = 4,
+                AUDIO_TYPE_COUNT   = 5 // last
         };
         
         LLAudioEngine();
diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp
index 0baa005..776c481 100644
--- a/linden/indra/llimage/llimage.cpp
+++ b/linden/indra/llimage/llimage.cpp
@@ -1547,6 +1547,7 @@ void LLImageFormatted::appendData(U8 *data, S32 size)
                         S32 newsize = cursize + size;
                         reallocateData(newsize);
                         memcpy(getData() + cursize, data, size);
+                        delete[] data;
                 }
         }
 }
diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp
index d6474f7..7cd4dd7 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -1231,7 +1231,9 @@ BOOL LLImageGL::readBackRaw(S32 discard_level, LLImageRaw* imageraw, bool compre
 
         if (width <= 0 || width > 2048 || height <= 0 || height > 2048 || ncomponents < 1 || ncomponents > 4)
         {
-                llerrs << llformat("LLImageGL::readBackRaw: bogus params: %d x %d x %d",width,height,ncomponents) << llendl;
+                //llerrs << llformat("LLImageGL::readBackRaw: bogus params: %d x %d x %d",width,height,ncomponents) << llendl;
+                llwarns << llformat("LLImageGL::readBackRaw: bogus params: %d x %d x %d",width,height,ncomponents) << llendl;
+                return FALSE;
         }
         
         LLGLint is_compressed = 0;
diff --git a/linden/indra/llui/CMakeLists.txt b/linden/indra/llui/CMakeLists.txt
index f646e63..a0f80b4 100644
--- a/linden/indra/llui/CMakeLists.txt
+++ b/linden/indra/llui/CMakeLists.txt
@@ -63,7 +63,6 @@ set(llui_SOURCE_FILES
     llspinctrl.cpp
     llstyle.cpp
     lltabcontainer.cpp
-    lltabcontainervertical.cpp
     lltextbox.cpp
     lltexteditor.cpp
     lltextparser.cpp
@@ -119,7 +118,6 @@ set(llui_HEADER_FILES
     llspinctrl.h
     llstyle.h
     lltabcontainer.h
-    lltabcontainervertical.h
     lltextbox.h
     lltexteditor.h
     lltextparser.h
diff --git a/linden/indra/llui/lltabcontainer.cpp b/linden/indra/llui/lltabcontainer.cpp
index 1f94191..4be779c 100644
--- a/linden/indra/llui/lltabcontainer.cpp
+++ b/linden/indra/llui/lltabcontainer.cpp
@@ -40,7 +40,6 @@
 #include "lltextbox.h"
 #include "llcriticaldamp.h"
 #include "lluictrlfactory.h"
-#include "lltabcontainervertical.h"
 #include "llrender.h"
 
 const F32 SCROLL_STEP_TIME = 0.4f;
diff --git a/linden/indra/llui/lltabcontainervertical.cpp b/linden/indra/llui/lltabcontainervertical.cpp
deleted file mode 100644
index a729c95..0000000
--- a/linden/indra/llui/lltabcontainervertical.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/** 
- * @file lltabcontainervertical.cpp
- * @brief LLTabContainerVertical base class
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-// deprecated: see LLTabContainer
diff --git a/linden/indra/llui/lltabcontainervertical.h b/linden/indra/llui/lltabcontainervertical.h
deleted file mode 100644
index ce42367..0000000
--- a/linden/indra/llui/lltabcontainervertical.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/** 
- * @file lltabcontainervertical.h
- * @brief LLTabContainerVertical base class
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-// deprecated: see LLTabContainer
diff --git a/linden/indra/llui/lluictrlfactory.cpp b/linden/indra/llui/lluictrlfactory.cpp
index 07eb39b..5cfc3ee 100644
--- a/linden/indra/llui/lluictrlfactory.cpp
+++ b/linden/indra/llui/lluictrlfactory.cpp
@@ -64,7 +64,6 @@
 #include "llmultisliderctrl.h"
 #include "llspinctrl.h"
 #include "lltabcontainer.h"
-#include "lltabcontainervertical.h"
 #include "lltextbox.h"
 #include "lltexteditor.h"
 #include "llui.h"
diff --git a/linden/indra/llui/lluifwd.h b/linden/indra/llui/lluifwd.h
index 32d5c9b..f99bb39 100644
--- a/linden/indra/llui/lluifwd.h
+++ b/linden/indra/llui/lluifwd.h
@@ -53,7 +53,6 @@ class LLSlider;
 class LLSliderCtrl;
 class LLSpinCtrl;
 class LLTabContainer;
-class LLTabContainerVertical;
 class LLTextBox;
 class LLTextEditor;
 class LLTextureCtrl;
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index aae182c..d71cf09 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -15,6 +15,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>AudioLevelGestures</key>
+  <map>
+    <key>Comment</key>
+    <string>Audio level of environment gestures</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>0.5</real>
+  </map>
   <key>AutoCloseOOC</key>
   <map>
     <key>Comment</key>
@@ -431,6 +442,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>MuteGestures</key>
+  <map>
+    <key>Comment</key>
+    <string>Gesture sound effects, play at 0 volume</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>MuteWind</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/app_settings/settings_per_account.xml b/linden/indra/newview/app_settings/settings_per_account.xml
index e965fe6..1a748f8 100644
--- a/linden/indra/newview/app_settings/settings_per_account.xml
+++ b/linden/indra/newview/app_settings/settings_per_account.xml
@@ -461,6 +461,17 @@
 
       <!-- Begin IM auto-response -->
 
+      <key>InstantMessageResponseEnabled</key>
+      <map>
+        <key>Comment</key>
+        <string>Toggles whether to auto-respond to instant messages or not</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>Boolean</string>
+        <key>Value</key>
+        <integer>0</integer>
+      </map>
       <key>InstantMessageResponseFriends</key>
       <map>
         <key>Comment</key>
diff --git a/linden/indra/newview/floaterbusy.cpp b/linden/indra/newview/floaterbusy.cpp
index 9188ae1..6c49461 100644
--- a/linden/indra/newview/floaterbusy.cpp
+++ b/linden/indra/newview/floaterbusy.cpp
@@ -158,6 +158,7 @@ BOOL FloaterBusy::postBuild()
         LLWStringUtil::replaceChar(auto_response, '%', ' ');
         childSetText("im_response", wstring_to_utf8str(auto_response));
 
+        childSetValue("InstantMessageResponseEnabled", gSavedPerAccountSettings.getBOOL("InstantMessageResponseEnabled"));
         childSetValue("InstantMessageResponseFriends", gSavedPerAccountSettings.getBOOL("InstantMessageResponseFriends"));
         childSetValue("InstantMessageResponseMuted", gSavedPerAccountSettings.getBOOL("InstantMessageResponseMuted"));
         childSetValue("InstantMessageResponseAnyone", gSavedPerAccountSettings.getBOOL("InstantMessageResponseAnyone"));
@@ -212,6 +213,7 @@ void FloaterBusy::apply()
         LLWStringUtil::replaceChar(im_response, '\n', '^');
         LLWStringUtil::replaceChar(im_response, ' ', '%');
         gSavedPerAccountSettings.setString("InstantMessageResponse", std::string(wstring_to_utf8str(im_response)));
+        gSavedPerAccountSettings.setBOOL("InstantMessageResponseEnabled", childGetValue("InstantMessageResponseEnabled").asBoolean());
         gSavedPerAccountSettings.setBOOL("InstantMessageResponseMuted", childGetValue("InstantMessageResponseMuted").asBoolean());
         gSavedPerAccountSettings.setBOOL("InstantMessageResponseFriends", childGetValue("InstantMessageResponseFriends").asBoolean());
         gSavedPerAccountSettings.setBOOL("InstantMessageResponseMuted", childGetValue("InstantMessageResponseMuted").asBoolean());
diff --git a/linden/indra/newview/jcfloaterareasearch.cpp b/linden/indra/newview/jcfloaterareasearch.cpp
index 5b269fa..ed00447 100644
--- a/linden/indra/newview/jcfloaterareasearch.cpp
+++ b/linden/indra/newview/jcfloaterareasearch.cpp
@@ -16,7 +16,7 @@
  *      may be used to endorse or promote products derived from this
  *      software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS LTD AND CONTRIBUTORS “AS IS”
+ * THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS LTD AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MODULAR SYSTEMS OR CONTRIBUTORS
diff --git a/linden/indra/newview/jcfloaterareasearch.h b/linden/indra/newview/jcfloaterareasearch.h
index 9feb9aa..1512030 100644
--- a/linden/indra/newview/jcfloaterareasearch.h
+++ b/linden/indra/newview/jcfloaterareasearch.h
@@ -16,7 +16,7 @@
  *      may be used to endorse or promote products derived from this
  *      software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS AND CONTRIBUTORS “AS IS”
+ * THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MODULAR SYSTEMS OR CONTRIBUTORS
diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp
index b422236..78d27b5 100644
--- a/linden/indra/newview/lightshare.cpp
+++ b/linden/indra/newview/lightshare.cpp
@@ -101,7 +101,7 @@ WindlightMessage::~WindlightMessage()
 // static
 void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 {
-        if( gSavedSettings.getU32("UseLightShare") <= LIGHTSHARE_NEVER )
+        if( gSavedSettings.getU32("LightShareAllowed") <= LIGHTSHARE_NEVER )
                 return;
 
         WindlightMessage* wl = new WindlightMessage(msg);
@@ -114,7 +114,7 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 
         // If they are using region settings already, or LightShare is
         // always allowed, just apply the new settings, don't bother asking.
-        if( gSavedSettings.getU32("UseLightShare") == LIGHTSHARE_ALWAYS ||
+        if( gSavedSettings.getU32("LightShareAllowed") == LIGHTSHARE_ALWAYS ||
             (sky == sSkyPresetName && water == sWaterPresetName) )
         {
                 wl->apply();
@@ -138,7 +138,7 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
                 return;
         }
 
-        if( gSavedSettings.getU32("UseLightShare") == LIGHTSHARE_ASK &&
+        if( gSavedSettings.getU32("LightShareAllowed") == LIGHTSHARE_ASK &&
             sMostRecent == NULL )
         {
                 // No most recent, so store this and create notification
diff --git a/linden/indra/newview/llfloatercustomize.cpp b/linden/indra/newview/llfloatercustomize.cpp
index 74b58bd..db51556 100644
--- a/linden/indra/newview/llfloatercustomize.cpp
+++ b/linden/indra/newview/llfloatercustomize.cpp
@@ -48,7 +48,6 @@
 #include "llscrollcontainer.h"
 #include "llscrollingpanellist.h"
 #include "llsliderctrl.h"
-#include "lltabcontainervertical.h"
 #include "llviewerwindow.h"
 #include "llinventorymodel.h"
 #include "llinventoryview.h"
diff --git a/linden/indra/newview/llfloatercustomize.h b/linden/indra/newview/llfloatercustomize.h
index d0e558f..aa93606 100644
--- a/linden/indra/newview/llfloatercustomize.h
+++ b/linden/indra/newview/llfloatercustomize.h
@@ -55,7 +55,6 @@ class LLMakeOutfitDialog;
 class LLRadioGroup;
 class LLScrollableContainerView;
 class LLScrollingPanelList;
-class LLTabContainerVertical;
 class LLTextBox;
 class LLTextureCtrl;
 class LLViewerJointMesh;
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index c468a5e..744c179 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -49,7 +49,6 @@
 #include "message.h"
 
 #include "llcommandhandler.h"
-#include "llfloaterabout.h"
 #include "llfloaterpreference.h"
 #include "llpanelnetwork.h"
 #include "llpanelaudioprefs.h"
@@ -353,7 +352,6 @@ LLFloaterPreference::LLFloaterPreference()
 
 BOOL LLFloaterPreference::postBuild()
 {
-        requires<LLButton>("About...");
         requires<LLButton>("OK");
         requires<LLButton>("Cancel");
         requires<LLButton>("Apply");
@@ -363,9 +361,6 @@ BOOL LLFloaterPreference::postBuild()
         {
                 return FALSE;
         }
-
-        mAboutBtn = getChild<LLButton>("About...");
-        mAboutBtn->setClickedCallback(onClickAbout, this);
         
         mApplyBtn = getChild<LLButton>("Apply");
         mApplyBtn->setClickedCallback(onBtnApply, this);
@@ -430,13 +425,6 @@ void LLFloaterPreference::show(void*)
 }
 
 
-// static
-void LLFloaterPreference::onClickAbout(void*)
-{
-        LLFloaterAbout::show(NULL);
-}
-
-
 // static 
 void LLFloaterPreference::onBtnOK( void* userdata )
 {
diff --git a/linden/indra/newview/llfloaterpreference.h b/linden/indra/newview/llfloaterpreference.h
index 894d242..1878280 100644
--- a/linden/indra/newview/llfloaterpreference.h
+++ b/linden/indra/newview/llfloaterpreference.h
@@ -40,7 +40,6 @@
 #define LL_LLFLOATERPREFERENCE_H
 
 #include "llfloater.h"
-#include "lltabcontainervertical.h"
 
 class LLPanelGeneral;
 class LLPanelInput;
@@ -119,12 +118,10 @@ protected:
 
         /*virtual*/ void                onClose(bool app_quitting);
 
-        LLButton*       mAboutBtn;
         LLButton        *mOKBtn;
         LLButton        *mCancelBtn;
         LLButton        *mApplyBtn;
 
-        static void             onClickAbout(void*);
         static void             onBtnOK(void*);
         static void             onBtnCancel(void*);
         static void             onBtnApply(void*);
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 6e0949f..bfcc04a 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -67,7 +67,6 @@
 #include "llscrolllistctrl.h"
 #include "llstatusbar.h"
 #include "lltabcontainer.h"
-#include "lltabcontainervertical.h"
 #include "llimview.h"
 #include "lltooldraganddrop.h"
 #include "lluiconstants.h"
diff --git a/linden/indra/newview/llpanelclassified.cpp b/linden/indra/newview/llpanelclassified.cpp
index c6f9b0c..36fc86d 100644
--- a/linden/indra/newview/llpanelclassified.cpp
+++ b/linden/indra/newview/llpanelclassified.cpp
@@ -54,7 +54,6 @@
 #include "lllineeditor.h"
 #include "llfloateravatarinfo.h"
 #include "llfloaterclassified.h"
-#include "lltabcontainervertical.h"
 #include "lltextbox.h"
 #include "llcombobox.h"
 #include "llviewertexteditor.h"
diff --git a/linden/indra/newview/llpanelpick.cpp b/linden/indra/newview/llpanelpick.cpp
index b26b51a..9c2638f 100644
--- a/linden/indra/newview/llpanelpick.cpp
+++ b/linden/indra/newview/llpanelpick.cpp
@@ -47,7 +47,6 @@
 #include "llcheckboxctrl.h"
 #include "llviewercontrol.h"
 #include "lllineeditor.h"
-#include "lltabcontainervertical.h"
 #include "lltextbox.h"
 #include "llviewertexteditor.h"
 #include "lltexturectrl.h"
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 60c936a..56c72c4 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -69,6 +69,7 @@ BOOL LLPrefsAdvanced::postBuild()
         childSetValue("language_is_public", gSavedSettings.getBOOL("LanguageIsPublic"));
         childSetValue("allow_mupose", gSavedSettings.getBOOL("AllowMUpose"));
         childSetValue("auto_close_ooc", gSavedSettings.getBOOL("AutoCloseOOC"));
+        childSetValue("shadows_check", gSavedSettings.getBOOL("ShadowsEnabled"));
 
         childSetValue("lightshare_combo",
                       LLSD((S32)gSavedSettings.getU32("LightShareAllowed")));
@@ -131,6 +132,7 @@ void LLPrefsAdvanced::apply()
                         childSetValue("shadows_check", FALSE);
                         LLNotifications::instance().add("NoShadows");
                         llwarns << "Attempting to enable shadow rendering while graphics settings less than Ultra or shaders are missing!" << llendl;
+                        gSavedSettings.setBOOL("ShadowsEnabled", FALSE);
                 }
                 else if ( (gSavedSettings.getBOOL("WindLightUseAtmosShaders") // If we do, toggle shadows in the correct order
                                 && gSavedSettings.getBOOL("VertexShaderEnable")) )
@@ -138,6 +140,7 @@ void LLPrefsAdvanced::apply()
                         gSavedSettings.setBOOL("RenderUseFBO", childGetValue("shadows_check").asBoolean());
                         gSavedSettings.setBOOL("RenderDeferred", childGetValue("shadows_check").asBoolean());
                         llinfos << "Shadow rendering enabled" << llendl;
+                        gSavedSettings.setBOOL("ShadowsEnabled", TRUE);
                 }
         }
         else if (!childGetValue("shadows_check").asBoolean()) 
@@ -147,9 +150,9 @@ void LLPrefsAdvanced::apply()
                         gSavedSettings.setBOOL("RenderDeferred", childGetValue("shadows_check").asBoolean());
                         gSavedSettings.setBOOL("RenderUseFBO", childGetValue("shadows_check").asBoolean());
                         llinfos << "Shadow rendering disabled" << llendl;
+                        gSavedSettings.setBOOL("ShadowsEnabled", FALSE);
                 }
         }
-        gSavedSettings.setBOOL("ShadowsEnabled", childGetValue("shadows_check").asBoolean());
 
         if (gSavedSettings.getBOOL("LegacyPieEnabled") == !((BOOL)childGetValue("legacy_pie_menu_checkbox")))
         {
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index 3cedf73..c5c14b5 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -1063,6 +1063,13 @@ void LLTextureCache::writeEntryAndClose(S32 idx, Entry& entry)
                 if (!mReadOnly)
                 {
                         entry.mTime = time(NULL);
+                        if(entry.mImageSize < entry.mBodySize)
+                        {
+                                // Just say no, due to my messing around to cache discards other than 0 we can end up here
+                                // after recalling an image from cache at a lower discard than cached. RC
+                                return;
+                        }
+
                         llassert_always(entry.mImageSize == 0 || entry.mImageSize == -1 || entry.mImageSize > entry.mBodySize);
                         if (entry.mBodySize > 0)
                         {
diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index 326a1b6..2184478 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -169,6 +169,9 @@ public:
                 mGetReason = reason;
         }
 
+        void setCanUseHTTP(bool can_use_http) {mCanUseHTTP = can_use_http;}
+        bool getCanUseHTTP()const {return mCanUseHTTP ;}
+
 protected:
         LLTextureFetchWorker(LLTextureFetch* fetcher, const LLUUID& id, const LLHost& host,
                                                  F32 priority, S32 discard, S32 size);
@@ -218,8 +221,15 @@ private:
                 QUEUED = 1,
                 SENT_SIM = 2
         };
+        enum e_write_to_cache_state //mWriteToCacheState
+        {
+                NOT_WRITE = 0,
+                CAN_WRITE = 1,
+                SHOULD_WRITE = 2
+        };
         static const char* sStateDescs[];
         e_state mState;
+        e_write_to_cache_state mWriteToCacheState;
         LLTextureFetch* mFetcher;
         LLPointer<LLImageFormatted> mFormattedImage;
         LLPointer<LLImageRaw> mRawImage;
@@ -254,6 +264,8 @@ private:
         BOOL mNeedsAux;
         BOOL mHaveAllData;
         BOOL mInLocalCache;
+        bool mCanUseHTTP ;
+        bool mCanUseNET ; //can get from asset server.
         S32 mHTTPFailCount;
         S32 mRetryAttempt;
         S32 mActiveCount;
@@ -379,6 +391,7 @@ LLTextureFetchWorker::LLTextureFetchWorker(LLTextureFetch* fetcher,
                                                                                    S32 size)                    // Desired size
         : LLWorkerClass(fetcher, "TextureFetch"),
           mState(INIT),
+          mWriteToCacheState(NOT_WRITE),
           mFetcher(fetcher),
           mID(id),
           mHost(host),
@@ -407,6 +420,7 @@ LLTextureFetchWorker::LLTextureFetchWorker(LLTextureFetch* fetcher,
           mNeedsAux(FALSE),
           mHaveAllData(FALSE),
           mInLocalCache(FALSE),
+          mCanUseHTTP(true),
           mHTTPFailCount(0),
           mRetryAttempt(0),
           mActiveCount(0),
@@ -417,6 +431,8 @@ LLTextureFetchWorker::LLTextureFetchWorker(LLTextureFetch* fetcher,
           mTotalPackets(0),
           mImageCodec(IMG_CODEC_INVALID)
 {
+        mCanUseNET = mUrl.empty() ;
+
         calcWorkPriority();
         mType = host.isOk() ? LLImageBase::TYPE_AVATAR_BAKE : LLImageBase::TYPE_NORMAL;
 //      llinfos << "Create: " << mID << " mHost:" << host << " Discard=" << discard << llendl;
@@ -573,13 +589,25 @@ bool LLTextureFetchWorker::doWork(S32 param)
 {
         LLMutexLock lock(&mWorkMutex);
 
-        if ((mFetcher->isQuitting() || (mImagePriority <= 0.0f) || getFlags(LLWorkerClass::WCF_DELETE_REQUESTED)))
+        if ((mFetcher->isQuitting() || getFlags(LLWorkerClass::WCF_DELETE_REQUESTED)))
         {
-                if (mState < WRITE_TO_CACHE)
-                {
+                if (mState < DECODE_IMAGE)
+                {
                         return true; // abort
                 }
         }
+        if (mImagePriority < 1.0f)
+        {
+                if (mState == INIT || mState == LOAD_FROM_NETWORK || mState == LOAD_FROM_SIMULATOR)
+                {
+                        return true; // abort
+                }
+        }
+        if (mState > CACHE_POST && !mCanUseNET && !mCanUseHTTP)
+        {
+                //nowhere to get data, abort.
+                return true ;
+        }
         
         if (mFetcher->mDebugPause|| gDisconnected)
         {
@@ -647,7 +675,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
                                 mCacheReadHandle = mFetcher->mTextureCache->readFromCache(mID, cache_priority,
                                                                                                                                                   offset, size, responder);
                         }
-                        else
+                        else if(mCanUseHTTP)
                         {
                                 if (!(mUrl.compare(0, 7, "http://") == 0))
                                 {
@@ -657,6 +685,11 @@ bool LLTextureFetchWorker::doWork(S32 param)
                                 setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
                                 mState = SEND_HTTP_REQ;
                         }
+                        else
+                        {
+                                setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
+                                mState = LOAD_FROM_NETWORK;
+                        }
                 }
 
                 if (mLoaded)
@@ -689,6 +722,10 @@ bool LLTextureFetchWorker::doWork(S32 param)
                         // we have enough data, decode it
                         llassert_always(mFormattedImage->getDataSize() > 0);
                         mState = DECODE_IMAGE;
+                        mWriteToCacheState = NOT_WRITE ;
+                        LL_DEBUGS("Texture") << mID << ": Cached. Bytes: " << mFormattedImage->getDataSize()
+                                                                 << " Size: " << llformat("%dx%d",mFormattedImage->getWidth(),mFormattedImage->getHeight())
+                                                                 << " Desired Discard: " << mDesiredDiscard << " Desired Size: " << mDesiredSize << LL_ENDL;
                         // fall through
                 }
                 else
@@ -716,7 +753,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
                 bool get_url = gSavedSettings.getBOOL("ImagePipelineUseHTTP");
                 if (!mUrl.empty()) get_url = false;
 //              if (mHost != LLHost::invalid) get_url = false;
-                if ( get_url )
+                if ( get_url && mCanUseHTTP && mUrl.empty())//get http url.
                 {
                         LLViewerRegion* region = NULL;
                         if (mHost == LLHost::invalid)
@@ -730,23 +767,35 @@ bool LLTextureFetchWorker::doWork(S32 param)
                                 if (!http_url.empty())
                                 {
                                         mUrl = http_url + "/?texture_id=" + mID.asString().c_str();
+                                        mWriteToCacheState = CAN_WRITE ; //because this texture has a fixed texture id.
+                                }
+                                else
+                                {
+                                        mCanUseHTTP = false ;
                                 }
                         }
                         else
                         {
-                                llwarns << "Region not found for host: " << mHost << llendl;
+                                // This will happen if not logged in or if a region deoes not have HTTP Texture enabled
+                                //llwarns << "Region not found for host: " << mHost << llendl;
+                                mCanUseHTTP = false;
                         }
                 }
-                if (!mUrl.empty())
+                if (mCanUseHTTP && !mUrl.empty())
                 {
                         mState = LLTextureFetchWorker::SEND_HTTP_REQ;
                         setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
+                        if(mWriteToCacheState != NOT_WRITE)
+                        {
+                                mWriteToCacheState = CAN_WRITE ;
+                        }
                         // don't return, fall through to next state
                 }
                 else if (mSentRequest == UNSENT)
                 {
                         // Add this to the network queue and sit here.
                         // LLTextureFetch::update() will send off a request which will change our state
+                        mWriteToCacheState = CAN_WRITE ;
                         mRequestedSize = mDesiredSize;
                         mRequestedDiscard = mDesiredDiscard;
                         mSentRequest = QUEUED;
@@ -778,6 +827,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
                         }
                         setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
                         mState = DECODE_IMAGE;
+                        mWriteToCacheState = SHOULD_WRITE ;
                 }
                 else
                 {
@@ -788,6 +838,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
         
         if (mState == SEND_HTTP_REQ)
         {
+                if(mCanUseHTTP)
                 {
                         const S32 HTTP_QUEUE_MAX_SIZE = 8;
                         // *TODO: Integrate this with llviewerthrottle
@@ -861,28 +912,78 @@ bool LLTextureFetchWorker::doWork(S32 param)
                         S32 cur_size = mFormattedImage.notNull() ? mFormattedImage->getDataSize() : 0;
                         if (mRequestedSize < 0)
                         {
-                                const S32 HTTP_MAX_RETRY_COUNT = 4;
-                                llinfos << "HTTP GET failed for: " << mUrl
-                                                << " Status: " << mGetStatus << " Reason: " << mGetReason
-                                                << " Try:" << mHTTPFailCount+1 << "/" << HTTP_MAX_RETRY_COUNT << llendl;
-                                if (cur_size == 0)
+                                S32 max_attempts;
+                                if (mGetStatus == HTTP_NOT_FOUND)
                                 {
-                                        ++mHTTPFailCount;
-                                        if (mGetStatus == HTTP_NOT_FOUND || mHTTPFailCount >= HTTP_MAX_RETRY_COUNT)
+                                        mHTTPFailCount = max_attempts = 1; // Don't retry
+                                        llwarns << "Texture missing from server (404): " << mUrl << llendl;
+
+                                        //roll back to try UDP
+                                        if(mCanUseNET)
+                                        {
+                                                mState = INIT ;
+                                                mCanUseHTTP = false ;
+                                                setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
+                                                return false ;
+                                        }
+                                        else
                                         {
+                                                // UDP is not an option, we are dead
                                                 resetFormattedData();
                                                 return true; // failed
                                         }
+                                }
+                                else if (mGetStatus == HTTP_SERVICE_UNAVAILABLE)
+                                {
+                                        // *TODO: Should probably introduce a timer here to delay future HTTP requsts
+                                        // for a short time (~1s) to ease server load? Ideally the server would queue
+                                        // requests instead of returning 503... we already limit the number pending.
+                                        ++mHTTPFailCount;
+                                        max_attempts = mHTTPFailCount+1; // Keep retrying
+                                        LL_INFOS_ONCE("Texture") << "Texture server busy (503): " << mUrl << LL_ENDL;
+                                }
+                                else
+                                        {
+                                        const S32 HTTP_MAX_RETRY_COUNT = 3;
+                                        max_attempts = HTTP_MAX_RETRY_COUNT + 1;
+                                        ++mHTTPFailCount;
+                                        llinfos << "HTTP GET failed for: " << mUrl
+                                                        << " Status: " << mGetStatus << " Reason: '" << mGetReason << "'"
+                                                        << " Attempt:" << mHTTPFailCount+1 << "/" << max_attempts << llendl;
+                                }
+
+                                if (mHTTPFailCount >= max_attempts)
+                                {
+                                        // Make max_attempts attempt at decoding what data we have, then bail forever on this image
+                                        if (cur_size > 0 && (mHTTPFailCount < (max_attempts+1)) )
+                                        {
+                                                // Use available data
+                                                mLoadedDiscard = mFormattedImage->getDiscardLevel();
+                                                mState = DECODE_IMAGE;
+                                                return false;
+                                        }
                                         else
                                         {
-                                                mState = SEND_HTTP_REQ;
-                                                return false; // retry
+                                                //roll back to try UDP
+                                                if(mCanUseNET)
+                                                {
+                                                        mState = INIT ;
+                                                        mCanUseHTTP = false ;
+                                                        setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
+                                                        return false ;
+                                                }
+                                                else
+                                                {
+                                                        // UDP is not an option, we are dead
+                                                        resetFormattedData();
+                                                        return true; // failed
+                                                }
                                         }
                                 }
                                 else
                                 {
-                                        mState = DECODE_IMAGE;
-                                        return false; // use what we have
+                                        mState = SEND_HTTP_REQ;
+                                        return false; // retry
                                 }
                         }
                         
@@ -898,10 +999,15 @@ bool LLTextureFetchWorker::doWork(S32 param)
                         }
                         
                         llassert_always(mBufferSize == cur_size + mRequestedSize);
-                        if (mHaveAllData)
+                        if (mHaveAllData && mRequestedDiscard == 0) //the image file is fully loaded.
                         {
                                 mFileSize = mBufferSize;
                         }
+                        else //the file size is unknown.
+                        {
+                                mFileSize = mBufferSize + 1 ; //flag the file is not fully loaded.
+                        }
+
                         U8* buffer = new U8[mBufferSize];
                         if (cur_size > 0)
                         {
@@ -916,6 +1022,10 @@ bool LLTextureFetchWorker::doWork(S32 param)
                         mBufferSize = 0;
                         mLoadedDiscard = mRequestedDiscard;
                         mState = DECODE_IMAGE;
+                        if(mWriteToCacheState != NOT_WRITE)
+                        {
+                                mWriteToCacheState = SHOULD_WRITE ;
+                        }
                         setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
                         return false;
                 }
@@ -980,7 +1090,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
 
         if (mState == WRITE_TO_CACHE)
         {
-                if (mInLocalCache || mSentRequest == UNSENT || mFormattedImage.isNull())
+                if (mWriteToCacheState != SHOULD_WRITE || mFormattedImage.isNull())
                 {
                         // If we're in a local cache or we didn't actually receive any new data,
                         // or we failed to load anything, skip
@@ -1032,7 +1142,15 @@ bool LLTextureFetchWorker::doWork(S32 param)
                 else
                 {
                         setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
-                        return true;
+
+                        if(mDecodedDiscard<=0)
+                        {
+                                return true;
+                        }
+                        else
+                        {
+                                return false;
+                        }
                 }
         }
         
diff --git a/linden/indra/newview/llvieweraudio.cpp b/linden/indra/newview/llvieweraudio.cpp
index 999e5dc..f043fb5 100644
--- a/linden/indra/newview/llvieweraudio.cpp
+++ b/linden/indra/newview/llvieweraudio.cpp
@@ -150,6 +150,8 @@ void audio_update_volume(bool force_update)
                                                                   gSavedSettings.getBOOL("MuteUI") ? 0.f : gSavedSettings.getF32("AudioLevelUI"));
                 gAudiop->setSecondaryGain(LLAudioEngine::AUDIO_TYPE_AMBIENT,
                                                                   gSavedSettings.getBOOL("MuteAmbient") ? 0.f : gSavedSettings.getF32("AudioLevelAmbient"));
+                gAudiop->setSecondaryGain(LLAudioEngine::AUDIO_TYPE_GESTURE,
+                                                                  gSavedSettings.getBOOL("MuteGestures") ? 0.f : gSavedSettings.getF32("AudioLevelGestures"));
         }
 
         // Streaming Music
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index cca737c..0edb2c4 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -582,6 +582,7 @@ void settings_setup_listeners()
         gSavedSettings.getControl("AudioLevelMusic")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
         gSavedSettings.getControl("AudioLevelMedia")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
         gSavedSettings.getControl("AudioLevelVoice")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("AudioLevelGestures")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
         gSavedSettings.getControl("AudioLevelDistance")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
         gSavedSettings.getControl("AudioLevelDoppler")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
         gSavedSettings.getControl("AudioLevelRolloff")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
@@ -593,6 +594,7 @@ void settings_setup_listeners()
         gSavedSettings.getControl("MuteVoice")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
         gSavedSettings.getControl("MuteAmbient")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
         gSavedSettings.getControl("MuteUI")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("MuteGestures")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
         gSavedSettings.getControl("RenderVBOEnable")->getSignal()->connect(boost::bind(&handleRenderUseVBOChanged, _1));
         gSavedSettings.getControl("WLSkyDetail")->getSignal()->connect(boost::bind(&handleWLSkyDetailChanged, _1));
         gSavedSettings.getControl("RenderLightingDetail")->getSignal()->connect(boost::bind(&handleRenderLightingDetailChanged, _1));
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index fb69389..9e2cc3d 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -5443,6 +5443,24 @@ class LLWorldSetBusy : public view_listener_t
         }
 };
 
+class LLWorldToggleAutoResponse: public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gSavedPerAccountSettings.setBOOL("InstantMessageResponseEnabled", !gSavedPerAccountSettings.getBOOL("InstantMessageResponseEnabled"));
+                return true;
+        }
+
+};
+
+class LLWorldCheckAutoResponse: public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(gSavedPerAccountSettings.getBOOL("InstantMessageResponseEnabled"));
+                return true;
+        }
+};
 
 class LLWorldCreateLandmark : public view_listener_t
 {
@@ -10947,6 +10965,8 @@ void initialize_menus()
         addMenu(new LLWorldTeleportHome(), "World.TeleportHome");
         addMenu(new LLWorldSetAway(), "World.SetAway");
         addMenu(new LLWorldSetBusy(), "World.SetBusy");
+        addMenu(new LLWorldToggleAutoResponse(), "World.ToggleAutoResponse");
+        addMenu(new LLWorldCheckAutoResponse(), "World.CheckAutoResponse");
 
         addMenu(new LLWorldEnableCreateLandmark(), "World.EnableCreateLandmark");
         addMenu(new LLWorldEnableSetHomeLocation(), "World.EnableSetHomeLocation");
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index bc1aedb..b243e34 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -1566,195 +1566,198 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         }
                 }
         }*/
-        bool typing_init = false;
-        if( dialog == IM_TYPING_START && !is_muted )
+        if (gSavedPerAccountSettings.getBOOL("InstantMessageResponseEnabled"))
         {
-                if(!gIMMgr->hasSession(computed_session_id) && gSavedPerAccountSettings.getBOOL("InstantMessageAnnounceIncoming"))
+                bool typing_init = false;
+                if( dialog == IM_TYPING_START && !is_muted )
                 {
-                        typing_init = true;
-                        if( gSavedPerAccountSettings.getBOOL("InstantMessageAnnounceStealFocus") )
+                        if(!gIMMgr->hasSession(computed_session_id) && gSavedPerAccountSettings.getBOOL("InstantMessageAnnounceIncoming"))
                         {
-                                /*LLUUID sess =*/ gIMMgr->addSession(name, IM_NOTHING_SPECIAL, from_id);
-                                make_ui_sound("UISndNewIncomingIMSession");
+                                typing_init = true;
+                                if( gSavedPerAccountSettings.getBOOL("InstantMessageAnnounceStealFocus") )
+                                {
+                                        /*LLUUID sess =*/ gIMMgr->addSession(name, IM_NOTHING_SPECIAL, from_id);
+                                        make_ui_sound("UISndNewIncomingIMSession");
+                                }
+                                gIMMgr->addMessage(
+                                                computed_session_id,
+                                                from_id,
+                                                name,
+                                                llformat("You sense a disturbance in the force...  (%s is typing)",name.c_str()),
+                                                name,
+                                                IM_NOTHING_SPECIAL,
+                                                parent_estate_id,
+                                                region_id,
+                                                position,
+                                                false);
                         }
-                        gIMMgr->addMessage(
-                                        computed_session_id,
-                                        from_id,
-                                        name,
-                                        llformat("You sense a disturbance in the force...  (%s is typing)",name.c_str()),
-                                        name,
-                                        IM_NOTHING_SPECIAL,
-                                        parent_estate_id,
-                                        region_id,
-                                        position,
-                                        false);
                 }
-        }
 
-        bool is_auto_response = false;
-        if(dialog == IM_NOTHING_SPECIAL) {
-                // detect auto responses from GreenLife and compatible viewers
-                is_auto_response = ( message.substr(0, 21) == "/me (auto-response): " );
-        }
+                bool is_auto_response = false;
+                if(dialog == IM_NOTHING_SPECIAL) {
+                        // detect auto responses from compatible viewers
+                        is_auto_response = ( message.substr(0, 21) == "/me (auto-response): " );
+                }
 
-        bool do_auto_response = false;
-        if( gSavedPerAccountSettings.getBOOL("InstantMessageResponseAnyone" ) )
-                do_auto_response = true;
+                bool do_auto_response = false;
+                if( gSavedPerAccountSettings.getBOOL("InstantMessageResponseAnyone" ) )
+                        do_auto_response = true;
 
-        // odd name for auto respond to non-friends
-        if( gSavedPerAccountSettings.getBOOL("InstantMessageResponseFriends") &&
-                LLAvatarTracker::instance().getBuddyInfo(from_id) == NULL )
-                do_auto_response = true;
+                // odd name for auto respond to non-friends
+                if( gSavedPerAccountSettings.getBOOL("InstantMessageResponseFriends") &&
+                        LLAvatarTracker::instance().getBuddyInfo(from_id) == NULL )
+                        do_auto_response = true;
 
-        if( is_muted && !gSavedPerAccountSettings.getBOOL("InstantMessageResponseMuted") )
-                do_auto_response = false;
+                if( is_muted && !gSavedPerAccountSettings.getBOOL("InstantMessageResponseMuted") )
+                        do_auto_response = false;
 
-        if( offline != IM_ONLINE )
-                do_auto_response = false;
+                if( offline != IM_ONLINE )
+                        do_auto_response = false;
 
-        if( is_auto_response )
-                do_auto_response = false;
+                if( is_auto_response )
+                        do_auto_response = false;
 
-        // handle cases where IM_NOTHING_SPECIAL is not an IM
-        if( name == SYSTEM_FROM ||
-                from_id.isNull() ||
-                to_id.isNull() )
-                do_auto_response = false;
+                // handle cases where IM_NOTHING_SPECIAL is not an IM
+                if( name == SYSTEM_FROM ||
+                        from_id.isNull() ||
+                        to_id.isNull() )
+                        do_auto_response = false;
 
-//      if( do_auto_response )
-// [RLVa:KB] - Alternate: Emerald-370
-        // Emerald specific: auto-response should be blocked if the avie is RLV @sendim=n restricted and the recipient is not an exception
-        if ( (do_auto_response) && ( (!gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM)) || (gRlvHandler.isException(RLV_BHVR_SENDIM, from_id)) ) )
-// [/RLVa:KB]
-        {
-                if((dialog == IM_NOTHING_SPECIAL && !is_auto_response) ||
-                        (dialog == IM_TYPING_START && gSavedPerAccountSettings.getBOOL("InstantMessageShowOnTyping"))
-                        )
+        //      if( do_auto_response )
+        // [RLVa:KB] - Alternate: Emerald-370
+                // Emerald specific: auto-response should be blocked if the avie is RLV @sendim=n restricted and the recipient is not an exception
+                if ( (do_auto_response) && ( (!gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM)) || (gRlvHandler.isException(RLV_BHVR_SENDIM, from_id)) ) )
+        // [/RLVa:KB]
                 {
-                        BOOL has = gIMMgr->hasSession(computed_session_id);
-                        if(!has || gSavedPerAccountSettings.getBOOL("InstantMessageResponseRepeat") || typing_init)
+                        if((dialog == IM_NOTHING_SPECIAL && !is_auto_response) ||
+                                (dialog == IM_TYPING_START && gSavedPerAccountSettings.getBOOL("InstantMessageShowOnTyping"))
+                                )
                         {
-                                BOOL show = !gSavedPerAccountSettings.getBOOL("InstantMessageShowResponded");
-                                if(!has && show)
-                                {
-                                        gIMMgr->addSession(name, IM_NOTHING_SPECIAL, from_id);
-                                }
-                                if(show)
-                                {
-                                        gIMMgr->addMessage(
-                                                        computed_session_id,
-                                                        from_id,
-                                                        SYSTEM_FROM,
-                                                        llformat("Autoresponse sent to %s.",name.c_str()),
-                                                        LLStringUtil::null,
-                                                        IM_NOTHING_SPECIAL,
-                                                        parent_estate_id,
-                                                        region_id,
-                                                        position,
-                                                        false);
-                                }
-                                std::string my_name;
-                                gAgent.buildFullname(my_name);
-
-                                //<-- Personalized Autoresponse by Madgeek
-                                std::string autoresponse = gSavedPerAccountSettings.getText("InstantMessageResponse");
-                                //Define Wildcards
-                                std::string fname_wildcard = "#f";
-                                std::string lname_wildcard = "#l";
-                                std::string time_wildcard = "#t";
-                                //Extract Name
-                                std::string f_name, l_name;
-                                std::istringstream inname(name);
-                                inname >> f_name >> l_name;
-                                //Generate a Timestamp
-                                time_t rawtime;
-                                time(&rawtime);
-                                char * timestamp_chars;
-                                timestamp_chars = asctime(localtime(&rawtime));
-                                std::string timestamp;
-                                timestamp.assign(timestamp_chars);
-                                timestamp = timestamp.substr(0, timestamp.find('\n'));
-                                //Handle Replacements
-                                size_t found = autoresponse.find(fname_wildcard);
-                                while(found != std::string::npos)
+                                BOOL has = gIMMgr->hasSession(computed_session_id);
+                                if(!has || gSavedPerAccountSettings.getBOOL("InstantMessageResponseRepeat") || typing_init)
                                 {
-                                        autoresponse.replace(found, 2, f_name);
-                                        found = autoresponse.find(fname_wildcard);
-                                }
-                                found = autoresponse.find(lname_wildcard);
-                                while(found != std::string::npos)
-                                {
-                                        autoresponse.replace(found, 2, l_name);
+                                        BOOL show = !gSavedPerAccountSettings.getBOOL("InstantMessageShowResponded");
+                                        if(!has && show)
+                                        {
+                                                gIMMgr->addSession(name, IM_NOTHING_SPECIAL, from_id);
+                                        }
+                                        if(show)
+                                        {
+                                                gIMMgr->addMessage(
+                                                                computed_session_id,
+                                                                from_id,
+                                                                SYSTEM_FROM,
+                                                                llformat("Autoresponse sent to %s.",name.c_str()),
+                                                                LLStringUtil::null,
+                                                                IM_NOTHING_SPECIAL,
+                                                                parent_estate_id,
+                                                                region_id,
+                                                                position,
+                                                                false);
+                                        }
+                                        std::string my_name;
+                                        gAgent.buildFullname(my_name);
+
+                                        //<-- Personalized Autoresponse by Madgeek
+                                        std::string autoresponse = gSavedPerAccountSettings.getText("InstantMessageResponse");
+                                        //Define Wildcards
+                                        std::string fname_wildcard = "#f";
+                                        std::string lname_wildcard = "#l";
+                                        std::string time_wildcard = "#t";
+                                        //Extract Name
+                                        std::string f_name, l_name;
+                                        std::istringstream inname(name);
+                                        inname >> f_name >> l_name;
+                                        //Generate a Timestamp
+                                        time_t rawtime;
+                                        time(&rawtime);
+                                        char * timestamp_chars;
+                                        timestamp_chars = asctime(localtime(&rawtime));
+                                        std::string timestamp;
+                                        timestamp.assign(timestamp_chars);
+                                        timestamp = timestamp.substr(0, timestamp.find('\n'));
+                                        //Handle Replacements
+                                        size_t found = autoresponse.find(fname_wildcard);
+                                        while(found != std::string::npos)
+                                        {
+                                                autoresponse.replace(found, 2, f_name);
+                                                found = autoresponse.find(fname_wildcard);
+                                        }
                                         found = autoresponse.find(lname_wildcard);
-                                }
-                                found = autoresponse.find(time_wildcard);
-                                while(found != std::string::npos)
-                                {
-                                        autoresponse.replace(found, 2, timestamp);
+                                        while(found != std::string::npos)
+                                        {
+                                                autoresponse.replace(found, 2, l_name);
+                                                found = autoresponse.find(lname_wildcard);
+                                        }
                                         found = autoresponse.find(time_wildcard);
-                                }
-                                //--> Personalized Autoresponse
-
-                                if(gSavedPerAccountSettings.getBOOL("InstantMessageResponseRepeat") && has && !typing_init) {
-                                        // send as busy auto response instead to prevent endless repeating replies
-                                        // when other end is a bot or broken client that answers to every usual IM
-                                        // reasoning for this decision can be found in RFC2812 3.3.2 Notices
-                                        // where PRIVMSG can be seen as IM_NOTHING_SPECIAL and NOTICE can be seen as
-                                        // IM_BUSY_AUTO_RESPONSE. The assumption here is that no existing client
-                                        // responds to IM_BUSY_AUTO_RESPONSE. --TS
-                                        std::string response = autoresponse;
-                                        pack_instant_message(
-                                                gMessageSystem,
-                                                gAgent.getID(),
-                                                FALSE,
-                                                gAgent.getSessionID(),
-                                                from_id,
-                                                my_name,
-                                                response,
-                                                IM_OFFLINE,
-                                                IM_BUSY_AUTO_RESPONSE,
-                                                session_id);
-                                } else {
-                                        std::string response = "/me (auto-response): "+autoresponse;
-                                        pack_instant_message(
-                                                gMessageSystem,
-                                                gAgent.getID(),
-                                                FALSE,
-                                                gAgent.getSessionID(),
-                                                from_id,
-                                                my_name,
-                                                response,
-                                                IM_OFFLINE,
-                                                IM_NOTHING_SPECIAL,
-                                                session_id);
-                                }
-                                gAgent.sendReliableMessage();
-                                if(gSavedPerAccountSettings.getBOOL("InstantMessageResponseItem") && (!has || typing_init))
-                                {
-                                        LLUUID itemid = (LLUUID)gSavedPerAccountSettings.getString("InstantMessageResponseItemData");
-                                        LLViewerInventoryItem* item = gInventory.getItem(itemid);
-                                        if(item)
+                                        while(found != std::string::npos)
+                                        {
+                                                autoresponse.replace(found, 2, timestamp);
+                                                found = autoresponse.find(time_wildcard);
+                                        }
+                                        //--> Personalized Autoresponse
+
+                                        if(gSavedPerAccountSettings.getBOOL("InstantMessageResponseRepeat") && has && !typing_init) {
+                                                // send as busy auto response instead to prevent endless repeating replies
+                                                // when other end is a bot or broken client that answers to every usual IM
+                                                // reasoning for this decision can be found in RFC2812 3.3.2 Notices
+                                                // where PRIVMSG can be seen as IM_NOTHING_SPECIAL and NOTICE can be seen as
+                                                // IM_BUSY_AUTO_RESPONSE. The assumption here is that no existing client
+                                                // responds to IM_BUSY_AUTO_RESPONSE. --TS
+                                                std::string response = autoresponse;
+                                                pack_instant_message(
+                                                        gMessageSystem,
+                                                        gAgent.getID(),
+                                                        FALSE,
+                                                        gAgent.getSessionID(),
+                                                        from_id,
+                                                        my_name,
+                                                        response,
+                                                        IM_OFFLINE,
+                                                        IM_BUSY_AUTO_RESPONSE,
+                                                        session_id);
+                                        } else {
+                                                std::string response = "/me (auto-response): "+autoresponse;
+                                                pack_instant_message(
+                                                        gMessageSystem,
+                                                        gAgent.getID(),
+                                                        FALSE,
+                                                        gAgent.getSessionID(),
+                                                        from_id,
+                                                        my_name,
+                                                        response,
+                                                        IM_OFFLINE,
+                                                        IM_NOTHING_SPECIAL,
+                                                        session_id);
+                                        }
+                                        gAgent.sendReliableMessage();
+                                        if(gSavedPerAccountSettings.getBOOL("InstantMessageResponseItem") && (!has || typing_init))
                                         {
-                                                //childSetValue("im_give_disp_rect_txt","Currently set to: "+item->getName());
-                                                if(show)
+                                                LLUUID itemid = (LLUUID)gSavedPerAccountSettings.getString("InstantMessageResponseItemData");
+                                                LLViewerInventoryItem* item = gInventory.getItem(itemid);
+                                                if(item)
                                                 {
-                                                        gIMMgr->addMessage(
-                                                                        computed_session_id,
-                                                                        from_id,
-                                                                        SYSTEM_FROM,
-                                                                        llformat("Sent %s auto-response item \"%s\"",name.c_str(),item->getName().c_str()),
-                                                                        LLStringUtil::null,
-                                                                        IM_NOTHING_SPECIAL,
-                                                                        parent_estate_id,
-                                                                        region_id,
-                                                                        position,
-                                                                        false);
+                                                        //childSetValue("im_give_disp_rect_txt","Currently set to: "+item->getName());
+                                                        if(show)
+                                                        {
+                                                                gIMMgr->addMessage(
+                                                                                computed_session_id,
+                                                                                from_id,
+                                                                                SYSTEM_FROM,
+                                                                                llformat("Sent %s auto-response item \"%s\"",name.c_str(),item->getName().c_str()),
+                                                                                LLStringUtil::null,
+                                                                                IM_NOTHING_SPECIAL,
+                                                                                parent_estate_id,
+                                                                                region_id,
+                                                                                position,
+                                                                                false);
+                                                        }
+                                                        LLToolDragAndDrop::giveInventory(from_id, item);
                                                 }
-                                                LLToolDragAndDrop::giveInventory(from_id, item);
                                         }
+                                        //InstantMessageResponseItem<
+                                        
                                 }
-                                //InstantMessageResponseItem<
-                                
                         }
                 }
         }
@@ -3931,8 +3934,10 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
         msg->getF32Fast(_PREHASH_SoundData, _PREHASH_Gain, gain);
 
         //If we have sounds muted, don't even try to load or trigger the sound.
-        if(gSavedSettings.getBOOL("MuteSounds") || gain == 0.0)
+        if (gSavedSettings.getBOOL("MuteSounds") || gain == 0.0)
+        {
                 return;
+        }
 
         // adjust sound location to true global coords
         LLVector3d      pos_global = from_region_handle(region_handle);
@@ -3940,9 +3945,6 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
         pos_global.mdV[VY] += pos_local.mV[VY];
         pos_global.mdV[VZ] += pos_local.mV[VZ];
 
-        // Don't play sounds if sound settings are muted.
-        if (gSavedSettings.getBOOL("MuteSounds")) return;
-
         // Don't play a trigger sound if you can't hear it due
         // to parcel "local audio only" settings.
         if (!LLViewerParcelMgr::getInstance()->canHearSound(pos_global)) return;
@@ -3960,11 +3962,25 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
                 return;
         }
 
+        // Don't load sounds if we have gestures muted -- MC
+        if ((owner_id != gAgent.getID()) && (object_id == owner_id))
+        {
+                if (gSavedSettings.getBOOL("MuteGestures"))
+                {
+                        return;
+                }
+                else
+                {
+                        gAudiop->triggerSound(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_GESTURE, pos_global);
+                }
+        }
+
         // Don't play sounds from a region with maturity above current agent maturity
-        if( !gAgent.canAccessMaturityInRegion( region_handle ) )
+        // Actually, let's -- MC
+        /*if( !gAgent.canAccessMaturityInRegion( region_handle ) )
         {
                 return;
-        }
+        }*/
                 
         gAudiop->triggerSound(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX, pos_global);
 }
@@ -4000,11 +4016,12 @@ void process_preload_sound(LLMessageSystem *msg, void **user_data)
         // help us out.
 
         // Don't play sounds from a region with maturity above current agent maturity
-        LLVector3d pos_global = objectp->getPositionGlobal();
+        // Actually, let's -- MC
+        /*LLVector3d pos_global = objectp->getPositionGlobal();
         if( !gAgent.canAccessMaturityAtGlobal( pos_global ) )
         {
                 return;
-        }
+        }*/
         
         // Add audioData starts a transfer internally.
         sourcep->addAudioData(datap, FALSE);
@@ -4040,11 +4057,12 @@ void process_attached_sound(LLMessageSystem *msg, void **user_data)
 
         
         // Don't play sounds from a region with maturity above current agent maturity
-        LLVector3d pos = objectp->getPositionGlobal();
+        // Actually, let's -- MC
+        /*LLVector3d pos = objectp->getPositionGlobal();
         if( !gAgent.canAccessMaturityAtGlobal(pos) )
         {
                 return;
-        }
+        }*/
         
         objectp->setAttachedSound(sound_id, owner_id, gain, flags);
 }
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 2732d48..f3eec54 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3428,7 +3428,7 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
         }
         if(avatar->getTE(5)->getID() != avatar->getTE(6)->getID() && !client.empty())
         {
-                client = "Failure";
+                client = "Unknown";
                 avatar_name_color = LLColor4::grey;
         }
         if(client.empty() && LLVOAvatar::sClientResolutionList.has("default"))
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml b/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml
index a9bd613..6d74882 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="busy" title="IM Response Options" 
-         height="446" width="255" min_height="446" min_width="255"
+         height="476" width="265" min_height="476" min_width="265"
          follows="top|right" can_close="true" can_drag_on_left="false"
          can_minimize="true" can_resize="false" can_tear_off="false">
 
   <check_box bottom="-40" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-     initial_value="false" label="Announce incoming instant messages" left="10" mouse_opaque="true"
+     initial_value="false" label="Auto-respond to incoming IMs" left="10" mouse_opaque="true"
+     name="InstantMessageResponseEnabled" radio_style="false" width="270"/>
+  <check_box bottom_delta="-30" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+     initial_value="false" label="Announce incoming IMs" left="10" mouse_opaque="true"
      name="InstantMessageAnnounceIncoming" radio_style="false" width="270"/>
   <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
      initial_value="false" label="Steal focus" left_delta="10" mouse_opaque="true" name="InstantMessageAnnounceStealFocus"
@@ -58,7 +61,7 @@
   
   <text_editor type="string" length="1" bottom_delta="-85" embedded_items="false" enabled="true"
      follows="left|top" font="SansSerifSmall" height="75" left_delta="-15" max_length="1100"
-     mouse_opaque="true" name="im_response" width="230" word_wrap="true"/>
+     mouse_opaque="true" name="im_response" width="245" word_wrap="true"/>
 
   <check_box bottom_delta="-30" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
      initial_value="false" label="Send an item along with the response" left_delta="0"
@@ -66,28 +69,28 @@
      width="270"/>
 
   <view_border blevel_style="in" bottom_delta="-20" follows="left|top" height="16" left_delta="0"
-     mouse_opaque="false" name="im_give_drop_target_rect" width="230"/>
+     mouse_opaque="false" name="im_give_drop_target_rect" width="245"/>
 
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom_delta="0"
      drop_shadow_visible="true" follows="left|top" font="SansSerifSmall" h_pad="0" halign="center"
      height="16" left_delta="0" mouse_opaque="true" name="Give inventory" tool_tip="Drop an inventory item here to have it given along with the auto-response."
-     v_pad="2" width="230">
+     v_pad="2" width="245">
     Drop an inventory item here
   </text>
 
   <view_border blevel_style="in" bottom_delta="-18" follows="left|top" height="16" left_delta="0"
-     mouse_opaque="false" name="im_give_disp_rect" width="230"/>
+     mouse_opaque="false" name="im_give_disp_rect" width="245"/>
 
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom_delta="0"
      drop_shadow_visible="true" follows="left|top" font="SansSerifSmall" h_pad="0" halign="center"
      height="16" left_delta="0" mouse_opaque="true" name="im_give_disp_rect_txt" tool_tip=""
-     v_pad="2" width="230">
+     v_pad="2" width="245">
     Currently set to: ITEM
   </text>
 
   <button bottom_delta="-26" follows="top|right" height="22" label="Cancel"
-     right="-10" name="btn_cancel" tool_tip="" enagled="true" width="80" />
+     right="-4" name="btn_cancel" tool_tip="" enagled="true" width="80" />
   <button bottom_delta="0" follows="top|right" height="22" label="OK"
-    right="-90" name="btn_ok" tool_tip="" enabled="true" width="80" />
+    right="-85" name="btn_ok" tool_tip="" enabled="true" width="80" />
   
 </floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
index 81168be..214db25 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
@@ -15,12 +15,9 @@
              left_delta="93" mouse_opaque="true" name="Apply" scale_image="true"
              width="90" />
         <button bottom="-455" enabled="true" follows="left|bottom" font="SansSerif"
-             halign="center" height="20" label="About" label_selected="About" left="9"
-             mouse_opaque="true" name="About..." scale_image="true" width="90" />
-        <button bottom="-455" enabled="true" follows="left|bottom" font="SansSerif"
              halign="center" height="20"
              help_url="http://secondlife.com/app/help/technical/preferences.php"
-             label="Help" label_selected="Help" left_delta="93" mouse_opaque="true"
+             label="Help" label_selected="Help" left="9" mouse_opaque="true"
              name="Help" scale_image="true" width="90" />
         <tab_container bottom="-431" enabled="true" follows="left|top|right|bottom" height="410"
              left="0" mouse_opaque="false" name="pref core" tab_group="1"
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 8033ba7..836c4dd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -503,6 +503,11 @@
     <menu_item_call name="Set Busy" label="Set Busy">
       <on_click function="World.SetBusy" userdata="" />
     </menu_item_call>
+    <menu_item_check name="Auto-Respond to IMs" label="Auto-Respond to IMs">
+      <on_click function="World.ToggleAutoResponse" userdata="" />
+      <on_check function="World.CheckAutoResponse" userdata="" />
+    </menu_item_check>
+    <menu_item_separator />
     <menu_item_call name="Stop Animating My Avatar" enabled="false"
                     label="Stop Animating My Avatar">
       <on_click function="Tools.StopAllAnimations" userdata="" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml
index ee9695e..c6e75fc 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml
@@ -49,6 +49,14 @@
              image_selected="icn_speaker-muted_dark.tga"
              image_unselected="icn_speaker_dark.tga" label="" label_width="55"
              left="150" name="mute_wind" tab_stop="false" toggle="true" width="25" />
+  <slider bottom_delta="-20" control_name="AudioLevelGestures" follows="left|top|right"
+       height="15" increment="0.05" initial_val="0.5" label="Gestures:"
+       label_width="55" left="10" max_val="1" min_val="0" name="Gestures"
+       show_text="false" volume="true" width="180" />
+  <button bottom_delta="0" control_name="MuteGestures" follows="top|right" height="16"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+             left="150" name="mute_gestures" tab_stop="false" toggle="true" width="25" />
         <slider bottom_delta="-20" control_name="AudioLevelUI" follows="left|top|right"
              height="15" increment="0.05" initial_val="0.5" label="Interface:" label_width="55"
              left="10" max_val="1" min_val="0" name="UI Volume" show_text="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml
index 7266536..3fdea5e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml
@@ -2,8 +2,8 @@
 <panel bg_visible="false" border="false" border_visible="false" bottom="1"
      follows="right|bottom" height="185" left="0" name="media_remote"
      use_bounding_rect="true" width="220">
-        <panel bottom="0" filename="panel_bg_tab.xml" height="187" left="0" width="220" />
-        <panel border="false" bottom="22" filename="panel_audio.xml" height="160"
+        <panel bottom="0" filename="panel_bg_tab.xml" height="197" left="0" width="220" />
+        <panel border="false" bottom="22" filename="panel_audio.xml" height="174"
              label="Audio &amp; Video" name="Volume Panel" width="220" />
         <panel bottom_delta="-10" filename="panel_media_controls.xml" left="0" />
                 <string name="play_label">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index ce2bbc1..310e056 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -14,40 +14,33 @@
              font="SansSerifSmall" height="16" initial_value="false"
              label="Disable teleport screen" left="12" mouse_opaque="true"
              name="disable_tp_screen_check" radio_style="false" width="217" />
-   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                        bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
-                        font="SansSerifsmall" h_pad="0" halign="left" height="16" left="16"
-                        mouse_opaque="true" name="online_no" v_pad="0" width="200">
-   Show client names:
-  </text>
-  <check_box bottom_delta="0" enabled="true" follows="left|top"
+  <check_box bottom_delta="-25" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
-       label="in nametag" left_delta="100" mouse_opaque="true"
+       label="Show client names in nametags" left="12" mouse_opaque="true"
        name="client_name_tag_check" radio_style="false" width="160" />
-  <check_box bottom_delta="0" enabled="true" follows="left|top"
+  <check_box bottom_delta="-18" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
-       label="changing nametag color" left_delta="80" mouse_opaque="true"
+       label="Show client names with color" left_delta="0" mouse_opaque="true"
        name="client_name_color_check" radio_style="false" width="160" />
-  <check_box bottom_delta="0" enabled="true" follows="left|top"
+  <check_box bottom_delta="-18" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
-       label="in tooltip" left_delta="140" mouse_opaque="true"
+       label="Show client names in hovertip" left_delta="0" mouse_opaque="true"
        name="client_name_hover_check" radio_style="false" width="160" />
   <check_box bottom_delta="-18" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
-       label="Broadcast your client name to others" left="12" mouse_opaque="true"
+       label="Show your client name to others" left_delta="0" mouse_opaque="true"
        name="client_name_tag_broadcast_check" radio_style="false" width="217" />
   <check_box bottom_delta="-25" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
        label="Enable shadows (WARNING: unstable and requires Ultra graphics)" left="12" mouse_opaque="true"
        name="shadows_check" radio_style="false" width="217" />
 
-
-  <text bottom_delta="-25" left="16" height="15" width="220"
+  <text bottom_delta="-25" left="16" height="15" width="300"
         follows="top|left">
-    Allow region Windlight settings (LightShare):
+    Allow region WindLight settings (LightShare):
   </text>
   <combo_box name="lightshare_combo"
-             bottom_delta="-2" left="240" height="18" width="120"
+             bottom_delta="-2" left_delta="250" height="18" width="120"
              allow_text_entry="false" follows="left|top">
     <combo_item type="string" name="never" value="0">
       Never
@@ -60,7 +53,6 @@
     </combo_item>
   </combo_box>
 
-
   <check_box bottom_delta="-25" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
        label="Use HTTP texture fetching" left="12" mouse_opaque="true"
@@ -94,7 +86,6 @@
        mouse_opaque="true" name="language_is_public"
        radio_style="false" tool_tip="This lets in-world objects know your preferred language."
        width="256" />
-
   <check_box bottom_delta="-25" enabled="true"
        follows="left|top" font="SansSerifSmall" height="16" hidden="false"
        initial_value="false" label="Use MU* pose style chat and IM" left="12"
@@ -103,7 +94,7 @@
        width="256" />
   <check_box bottom_delta="0" enabled="true"
        follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-       initial_value="false" label="Auto-close OOC chat" left_delta="180"
+       initial_value="false" label="Auto-close OOC (( )) chat" left_delta="250"
        mouse_opaque="true" name="auto_close_ooc"
        radio_style="false" tool_tip="Auto-close OOC chat (i.e. add )) if not found and (( was used)."
        width="256" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 400da56..c6bb938 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -20,10 +20,10 @@
              mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
                 Audio:
         </text>
-        <panel border="true" bottom="-195" enabled="true" filename="panel_audio.xml"
+        <panel border="true" bottom="-187" enabled="true" filename="panel_audio.xml"
              follows="left|top|right|bottom" height="180" label="Volume" left="148"
              mouse_opaque="true" name="Volume Panel" width="260" />
-        <check_box bottom="-195" control_name="AudioStreamingMusic" enabled="true"
+        <check_box bottom="-205" control_name="AudioStreamingMusic" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Play streaming music when available (uses more bandwidth)"
              left="142" mouse_opaque="true" name="streaming_music" radio_style="false"
@@ -42,7 +42,7 @@
              initial_value="true" label="Automatically play media" left="162"
              mouse_opaque="true" name="auto_streaming_video" radio_style="false"
              width="338" />
-        <check_box bottom_delta="-34" control_name="MuteWhenMinimized" enabled="true"
+        <check_box bottom_delta="-27" control_name="MuteWhenMinimized" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Mute audio when window minimized" left="142" mouse_opaque="true"
              name="mute_when_minimized" radio_style="false" width="215" />
@@ -57,7 +57,7 @@
              label_width="158" left="148" max_val="10000" min_val="0"
              mouse_opaque="true" name="Health change threshold" width="212" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-       bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
+       bottom_delta="-27" drop_shadow_visible="true" enabled="true" follows="left|top"
        font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
        mouse_opaque="true" name="ambient_prefs_text" v_pad="0" width="128">
     Ambient:
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 199f2a8..1357eb5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -183,14 +183,14 @@
         <combo_box allow_text_entry="false" bottom="-352" enabled="true" follows="left|top"
              height="18" left="153" max_chars="20" mouse_opaque="true"
              name="time_combobox" width="146">
-                <combo_item type="string" length="1" enabled="true" name="12HourTime" value="Use 12 Hour Sim Time">
-                        Use 12 Hour Sim Time
+                <combo_item type="string" name="12HourTime" value="PST 12">
+                        12-hour PST/PDT
                 </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="24HourTime" value="Use 24 Hour Sim Time">
-                        Use 24 Hour Sim Time
+                <combo_item type="string" name="24HourTime" value="PST 24">
+                        24-hour PST/PDT
                 </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="UTCTime" value="Use UTC Time">
-                        Use UTC Time
+                <combo_item type="string" name="UTCTime" value="UTC">
+                        UTC
                 </combo_item>
         </combo_box>
         <combo_box allow_text_entry="true" bottom="-382" enabled="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index 58845ad..0904815 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -63,7 +63,7 @@
              font="SansSerifSmall" height="70" left="148" max_length="255"
              mouse_opaque="true" name="busy_response" width="330" word_wrap="true" />
   <button bottom_delta="-25" follows="top|right" height="22" label="IM Response Options"
-     left="164" name="busy_adv_btn" tool_tip="Auto response options"
+     left="164" name="busy_adv_btn" tool_tip="Instant message Auto-Response options"
      width="180" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-23" drop_shadow_visible="true" enabled="true" follows="left|top"