79 files changed, 2162 insertions, 409 deletions
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index e6c1767..dedced0 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -88,6 +88,7 @@ set(viewer_SOURCE_FILES
    impprefsfonts.cpp
    jcfloater_animation_list.cpp
    jcfloaterareasearch.cpp
+    kokuastreamingaudio.cpp
    kowopenregionsettings.cpp
    lightshare.cpp
    llagent.cpp
@@ -172,6 +173,7 @@ set(viewer_SOURCE_FILES
    llfloatercustomize.cpp
    llfloaterdaycycle.cpp
    llfloaterdirectory.cpp
+    llfloaterdisplayname.cpp
    llfloatereditui.cpp
    llfloaterenvsettings.cpp
    llfloaterevent.cpp
@@ -409,6 +411,7 @@ set(viewer_SOURCE_FILES
    llviewercamera.cpp
    llviewercontrol.cpp
    llviewerdisplay.cpp
+    llviewerdisplayname.cpp
    llviewergenericmessage.cpp
    llviewergesture.cpp
    llviewerimage.cpp
@@ -541,6 +544,7 @@ set(viewer_HEADER_FILES
    impprefsfonts.h
    jcfloater_animation_list.h
    jcfloaterareasearch.h
+    kokuastreamingaudio.h
    lightshare.h
        lggautocorrectfloater.h
        lggautocorrect.h
@@ -630,6 +634,7 @@ set(viewer_HEADER_FILES
    llfloatercustomize.h
    llfloaterdaycycle.h
    llfloaterdirectory.h
+    llfloaterdisplayname.h
    llfloatereditui.h
    llfloaterenvsettings.h
    llfloaterevent.h
@@ -871,6 +876,7 @@ set(viewer_HEADER_FILES
    llviewercamera.h
    llviewercontrol.h
    llviewerdisplay.h
+    llviewerdisplayname.h
    llviewergenericmessage.h
    llviewergesture.h
    llviewerimage.h
@@ -1367,7 +1373,7 @@ if (WINDOWS)
        DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
        )
-    add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit) # Removed media_plugin_gstreamer010
+    add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit media_plugin_gstreamer010)
    if (PACKAGE)
      add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat)
@@ -1583,17 +1589,17 @@ if (WINDOWS)
        COMMENT "Copying WebKit Plugin to the runtime folder."
        )
        
-   #get_target_property(BUILT_GSTREAMER_PLUGIN media_plugin_gstreamer010 LOCATION)
+   get_target_property(BUILT_GSTREAMER_PLUGIN media_plugin_gstreamer010 LOCATION)
-   # add_custom_command(
+     add_custom_command(
-   #     TARGET ${VIEWER_BINARY_NAME} POST_BUILD
+        TARGET ${VIEWER_BINARY_NAME} POST_BUILD
-   #     COMMAND ${CMAKE_COMMAND}
+        COMMAND ${CMAKE_COMMAND}
-   #     ARGS
+        ARGS
-   #       -E
+          -E
-   #       copy_if_different
+          copy_if_different
-   #       ${BUILT_GSTREAMER_PLUGIN}
+          ${BUILT_GSTREAMER_PLUGIN}
-   #       ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin
+          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin
-   #     COMMENT "Copying Gstreamer Plugin to the runtime folder."
+        COMMENT "Copying Gstreamer Plugin to the runtime folder."
-   #     )
+        )
        
  get_target_property(BUILT_QUICKTIME_PLUGIN media_plugin_quicktime LOCATION)
    add_custom_command(
diff --git a/linden/indra/newview/app_settings/cloud.xml b/linden/indra/newview/app_settings/cloud.xml
new file mode 100644
index 0000000..ff9492b
--- /dev/null
+++ b/linden/indra/newview/app_settings/cloud.xml
@@ -0,0 +1,88 @@
+<llsd>
+    <map>
+    <key>AngularVelocity</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>BurstPartCount</key>
+        <integer>1</integer>
+    <key>BurstRadius</key>
+        <real>0.3</real>
+    <key>BurstRate</key>
+        <real>0.02</real>
+    <key>BurstSpeedMax</key>
+        <real>1</real>
+    <key>Endcolor</key>
+        <array>
+            <real>0.75</real>
+            <real>0.47</real>
+            <real>0.81</real>
+            <real>0</real>
+        </array>
+    <key>Endscale</key>
+        <array>
+            <real>0.02</real>
+            <real>0.02</real>
+        </array>
+    <key>InnerAngle</key>
+        <real>3.1415927410125732421875</real>
+    <key>LL_PART_BEAM_MASK</key>
+        <integer>0</integer>
+    <key>LL_PART_BOUNCE_MASK</key>
+        <integer>0</integer>
+    <key>LL_PART_EMISSIVE_MASK</key>
+        <integer>1</integer>
+    <key>LL_PART_FOLLOW_SRC_MASK</key>
+        <integer>0</integer>
+    <key>LL_PART_FOLLOW_VELOCITY_MASK</key>
+        <integer>0</integer>
+    <key>LL_PART_INTERP_COLOR_MASK</key>
+        <integer>1</integer>
+    <key>LL_PART_INTERP_SCALE_MASK</key>
+        <integer>1</integer>
+    <key>LL_PART_SRC_PATTERN_ANGLE</key>
+        <integer>0</integer>
+    <key>LL_PART_SRC_PATTERN_ANGLE_CONE</key>
+        <integer>1</integer>
+    <key>LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY</key>
+        <integer>0</integer>
+    <key>LL_PART_SRC_PATTERN_DROP</key>
+        <integer>0</integer>
+    <key>LL_PART_SRC_PATTERN_EXPLODE</key>
+        <integer>0</integer>
+    <key>LL_PART_TARGET_LINEAR_MASK</key>
+        <integer>0</integer>
+    <key>LL_PART_TARGET_POS_MASK</key>
+        <integer>1</integer>
+    <key>LL_PART_WIND_MASK</key>
+        <integer>0</integer>
+    <key>OuterAngle</key>
+        <real>0</real>
+    <key>PartImageID</key>
+        <string>0000000000000-0000-0000-000000000000</string>
+    <key>ParticleMaxAge</key>
+        <real>0</real>
+    <key>ParticleStartAge</key>
+        <real>0</real>
+    <key>SourceMaxage</key>
+        <real>4</real>
+    <key>Startcolor</key>
+        <array>
+            <real>0.9</real>
+            <real>0.0</real>
+            <real>0.8</real>
+            <real>0.7</real>
+        </array>
+    <key>Startscale</key>
+        <array>
+            <real>0.8</real>
+            <real>0.8</real>
+        </array>
+    <key>TargetId</key>
+        <string>00000000-0000-0000-0000-000000000000</string>
+    <key>BurstSpeedMin</key>
+        <real>0.1</real>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index c94fc51..cdc837d 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -66,7 +66,15 @@
                                                        <!--<string>Messaging</string>-->
                                                        <!--<string>Notifications</string>-->
-              <!--<string>Plugin</string>-->
+                <string>Plugin</string>
+                <string>PluginClassMedia</string>
+                <string>PluginInstance</string>
+                <string>PluginPipe</string>
+                <string>PluginChild</string>
+                <!--<string>PluginSpam</string>-->
+                <string>PluginParent</string>
+                <string>PluginViewerMedia</string>
              <!--<string>Radar</string>-->
                                                        <!--<string>ShaderLoading</string>-->
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 4c822bf..2d9d810 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -419,6 +419,42 @@
    <key>Value</key>
    <integer>0</integer>
  </map>
+  <!-- Display Names -->
+    <key>DisplayNamesUsage</key>
+    <map>
+      <key>Comment</key>
+      <string>Usage type for display names: 0 = Legacy name only, 1 = display name only (legacy name when absent), 2 = Display name with legacy name</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>2</integer>
+    </map>
+    <key>OmitResidentAsLastName</key>
+    <map>
+      <key>Comment</key>
+      <string>Do not display "Resident" as the last name for new residents in their legacy name</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>LegacyNamesForFriends</key>
+    <map>
+      <key>Comment</key>
+      <string>When TRUE, forces the use of the legacy names for the friends list and online notifications</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
  <key>EmeraldTemporaryUpload</key>
  <map>
    <key>Comment</key>
@@ -1330,6 +1366,17 @@
    <key>Value</key>
    <integer>1</integer>
  </map>
+  <key>WarnFirstPrivacy</key>
+  <map>
+    <key>Comment</key>
+    <string>Enables FirstPrivacy warning on login</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
  <key>WarnFirstVoiceLicense</key>
  <map>
    <key>Comment</key>
diff --git a/linden/indra/newview/chatbar_as_cmdline.cpp b/linden/indra/newview/chatbar_as_cmdline.cpp
index 0593091..b5a7e8c 100644
--- a/linden/indra/newview/chatbar_as_cmdline.cpp
+++ b/linden/indra/newview/chatbar_as_cmdline.cpp
@@ -69,7 +69,7 @@
 #include "llviewerparcelmgr.h"
 #include "llviewerparcelmedia.h"
 #include "llparcel.h"
-#include "llaudioengine.h"
+#include "kokuastreamingaudio.h"
 #include "llviewerparcelmediaautoplay.h"
 #include "lloverlaybar.h"
 #include "lggautocorrectfloater.h"
@@ -367,7 +367,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
                                        {
                                                gOverlayBar->toggleMusicPlay(gOverlayBar);
                                        }
-                                        gAudiop->startInternetStream(status);
+                                        gAudioStream->startInternetStream(status);
                                        return false;
                                }
                        }
diff --git a/linden/indra/newview/kokuastreamingaudio.cpp b/linden/indra/newview/kokuastreamingaudio.cpp
new file mode 100644
index 0000000..ed606db
--- /dev/null
+++ b/linden/indra/newview/kokuastreamingaudio.cpp
@@ -0,0 +1,129 @@
+ /** 
+ * @file kokuastreamingaudio.cpp
+ * @brief Definition of KOKUAStreamingAudio base class for streaming audio support
+ *
+ * $LicenseInfo:firstyear=2011&license=viewergpl$
+ * Kokua Viewer Source Code
+ * Copyright (C) 2011, Armin.Weatherwax (at) googlemail.com
+ * for the Kokua Viewer Team, in special for our Imprudence Viewer.
+ * 
+ * The source code in this file ("Source Code") is provided by the author
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL").  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.
+ * 
+ * THIS SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ *
+ * $/LicenseInfo$
+ */
+#include "kokuastreamingaudio.h"
+#include "llstreamingaudio.h"
+KOKUAStreamingAudio* gAudioStream = NULL;
+KOKUAStreamingAudio::KOKUAStreamingAudio(LLStreamingAudioInterface *impl) :
+mStreamingAudioImpl (impl)
+{
+}
+KOKUAStreamingAudio::~KOKUAStreamingAudio()
+{
+        if (mStreamingAudioImpl)
+        {
+                delete mStreamingAudioImpl;
+                mStreamingAudioImpl = NULL;
+        }
+}
+LLStreamingAudioInterface* KOKUAStreamingAudio::getStreamingAudioImpl()
+{
+        return mStreamingAudioImpl;
+}
+// void KOKUAStreamingAudio::setStreamingAudioImpl(LLStreamingAudioInterface *impl)
+// {
+//      mStreamingAudioImpl = impl;
+// }
+// virtual
+void KOKUAStreamingAudio::startInternetStream(const std::string& url)
+{
+        if (mStreamingAudioImpl)
+                mStreamingAudioImpl->start(url);
+}
+// virtual
+void KOKUAStreamingAudio::stopInternetStream()
+{
+        if (mStreamingAudioImpl)
+                mStreamingAudioImpl->stop();
+}
+// virtual
+void KOKUAStreamingAudio::pauseInternetStream(int pause)
+{
+        if (mStreamingAudioImpl)
+                mStreamingAudioImpl->pause(pause);
+}
+// virtual
+void KOKUAStreamingAudio::updateInternetStream()
+{
+        if (mStreamingAudioImpl)
+                mStreamingAudioImpl->update();
+}
+// virtual
+KOKUAStreamingAudio::KOKUAAudioPlayState KOKUAStreamingAudio::isInternetStreamPlaying()
+{
+        if (mStreamingAudioImpl)
+                return (KOKUAStreamingAudio::KOKUAAudioPlayState) mStreamingAudioImpl->isPlaying();
+        return KOKUAStreamingAudio::AUDIO_STOPPED; // Stopped
+}
+// virtual
+void KOKUAStreamingAudio::setInternetStreamGain(F32 vol)
+{
+        if (mStreamingAudioImpl)
+                mStreamingAudioImpl->setGain(vol);
+}
+F32 KOKUAStreamingAudio::getInternetStreamGain()
+{
+        if (mStreamingAudioImpl)
+                return mStreamingAudioImpl->getGain();
+        else
+                return 1.0f;
+}
+// virtual
+std::string KOKUAStreamingAudio::getInternetStreamURL()
+{
+        if (mStreamingAudioImpl)
+                return mStreamingAudioImpl->getURL();
+        else return std::string();
+}
+std::string KOKUAStreamingAudio::getVersion()
+{
+        if (mStreamingAudioImpl)
+                return mStreamingAudioImpl->getVersion();
+        else return std::string();
+}
+\ No newline at end of file
diff --git a/linden/indra/newview/kokuastreamingaudio.h b/linden/indra/newview/kokuastreamingaudio.h
new file mode 100644
index 0000000..eb49f25
--- /dev/null
+++ b/linden/indra/newview/kokuastreamingaudio.h
@@ -0,0 +1,71 @@
+/** 
+ * @file kokuastreamingaudio.h
+ * @brief Definition of KOKUAStreamingAudio base class for streaming audio support
+ *
+ * $LicenseInfo:firstyear=2011&license=viewergpl$
+ * Kokua Viewer Source Code
+ * Copyright (C) 2011, Armin.Weatherwax (at) googlemail.com
+ * for the Kokua Viewer Team.
+ * 
+ * The source code in this file ("Source Code") is provided by the author
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL").  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.
+ * 
+ * THIS SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ *
+ * $/LicenseInfo$
+ */
+#ifndef KOKUA_STREAMINGAUDIO_H
+#define KOKUA_STREAMINGAUDIO_H
+#include "linden_common.h"
+class LLStreamingAudioInterface;
+class KOKUAStreamingAudio 
+{
+public:
+        enum KOKUAAudioPlayState
+        {
+                // isInternetStreamPlaying() returns an *int*, with
+                // 0 = stopped, 1 = playing, 2 = paused.
+                AUDIO_STOPPED = 0,
+                AUDIO_PLAYING = 1,
+                AUDIO_PAUSED = 2
+        };
+        KOKUAStreamingAudio(LLStreamingAudioInterface *impl);
+        virtual ~KOKUAStreamingAudio();
+        LLStreamingAudioInterface *getStreamingAudioImpl();
+//      void setStreamingAudioImpl(LLStreamingAudioInterface *impl);
+        void startInternetStream(const std::string& url);
+        void stopInternetStream();
+        void pauseInternetStream(int pause);
+        void updateInternetStream(); 
+        KOKUAAudioPlayState isInternetStreamPlaying();
+        void setInternetStreamGain(F32 vol);
+        F32 getInternetStreamGain();
+        std::string getInternetStreamURL();
+        std::string getVersion();       
+private:
+        LLStreamingAudioInterface *mStreamingAudioImpl;
+};
+extern KOKUAStreamingAudio* gAudioStream;
+#endif
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 5a1700a..515d588 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -7488,7 +7488,7 @@ void LLAgent::sendAgentSetAppearance()
                 param;
                 param = (LLViewerVisualParam*)mAvatarObject->getNextVisualParam())
        {
-                if (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE)
+                if (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE) // do not transmit params of group VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT
                {
                        msg->nextBlockFast(_PREHASH_VisualParam );
                        
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 8aea221..6b98c8e 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -104,6 +104,7 @@
 #include "llassetstorage.h"
 #include "llpolymesh.h"
 #include "llcachename.h"
+#include "kokuastreamingaudio.h"
 #include "llaudioengine.h"
 #include "llstreamingaudio.h"
 #include "llviewermenu.h"
@@ -920,7 +921,7 @@ bool LLAppViewer::mainLoop()
        //-------------------------------------------
        // Create IO Pump to use for HTTP Requests.
-        gServicePump = new LLPumpIO(gAPRPoolp);
+        gServicePump = new LLPumpIO;
        LLHTTPClient::setPump(*gServicePump);
        LLCurl::setCAFile(gDirUtilp->getCAFile());
        
@@ -1258,6 +1259,7 @@ bool LLAppViewer::cleanup()
        LLPolyMesh::freeAllMeshes();
+        LLAvatarNameCache::cleanupClass();
        delete gCacheName;
        gCacheName = NULL;
@@ -1278,14 +1280,16 @@ bool LLAppViewer::cleanup()
        
        llinfos << "Global stuff deleted" << llendflush;
-        if (gAudiop)
+        if (gAudioStream)
        {
                // shut down the streaming audio sub-subsystem first, in case it relies on not outliving the general audio subsystem.
-                LLStreamingAudioInterface *sai = gAudiop->getStreamingAudioImpl();
+                delete gAudioStream;
-                delete sai;
+                gAudioStream = NULL;
-                gAudiop->setStreamingAudioImpl(NULL);
+        }
+        if (gAudiop)
+        {
                // shut down the audio subsystem
                bool want_longname = false;
@@ -1642,19 +1646,38 @@ bool LLAppViewer::initLogging()
        LLError::initForApplication(
                                gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));
        LLError::setFatalFunction(errorCallback);
-        
-        // Remove the last ".old" log file.
-        std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
-                                                             "Imprudence.old");
-        LLFile::remove(old_log_file);
-        // Rename current log file to ".old"
+        std::string log_name = "Imprudence.log";
-        std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
-                                                             "Imprudence.log");
-        LLFile::rename(log_file, old_log_file);
-        // Set the log file to Imprudence.log
+        const int MAX_ROTATION = 5;
+        for(int i = MAX_ROTATION; 0 < i; i--)
+        {
+                std::ostringstream current;
+                current << ".";
+                current << i;
+                std::ostringstream previous;
+                if( 1 < i )
+                {
+                        previous << ".";
+                        previous << i-1;
+                }
+                std::string current_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
+                                                             log_name + current.str());
+                std::string previous_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
+                                                             log_name + previous.str());
+                if (MAX_ROTATION == i)
+                {
+                        LLFile::remove(current_log_file);
+                }
+                LLFile::rename(previous_log_file, current_log_file);
+        }
+        // Set the log file to Imprudence.log
+        std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, log_name);
        LLError::logToFile(log_file);
        // *FIX:Mani no error handling here!
@@ -1861,6 +1884,7 @@ bool LLAppViewer::initConfiguration()
        LLFirstUse::addConfigVariable("FirstVoice");
        LLFirstUse::addConfigVariable("FirstMedia");
        LLFirstUse::addConfigVariable("FirstLoginScreen");
+        LLFirstUse::addConfigVariable("FirstPrivacy");
                
 // [RLVa:KB] - Checked: RLVa-1.0.3a (2009-09-10) | Added: RLVa-1.0.3a
        //LLFirstUse::addConfigVariable(RLV_SETTING_FIRSTUSE_DETACH);
@@ -3296,6 +3320,14 @@ void LLAppViewer::saveFinalSnapshot()
 void LLAppViewer::loadNameCache()
 {
+        // display names cache
+        std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "avatar_name_cache.xml");
+        llifstream name_cache_stream(filename);
+        if (name_cache_stream.is_open())
+        {
+                LLAvatarNameCache::importFile(name_cache_stream);
+        }
        if (!gCacheName) return;
        std::string name_cache;
@@ -3318,6 +3350,14 @@ void LLAppViewer::loadNameCache()
 void LLAppViewer::saveNameCache()
 {
+        // display names cache
+        std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "avatar_name_cache.xml");
+        llofstream name_cache_stream(filename);
+        if (name_cache_stream.is_open())
+        {
+                LLAvatarNameCache::exportFile(name_cache_stream);
+        }
        if (!gCacheName) return;
        std::string name_cache;
@@ -3469,18 +3509,22 @@ void LLAppViewer::idle()
                // Initialize the viewer_stats_timer with an already elapsed time
                // of SEND_STATS_PERIOD so that the initial stats report will
                // be sent immediately.
-                static LLFrameStatsTimer viewer_stats_timer(SEND_STATS_PERIOD);
+                if(!gDisconnected && gHippoGridManager->getConnectedGrid()->isSecondLife())
-                reset_statistics();
-                // Update session stats every large chunk of time
-                // *FIX: (???) SAMANTHA
-                /* or don't! part of a larger effort to waste less CPU cycles. -Patrick Sapinski (Sunday, November 29, 2009)
-                if (viewer_stats_timer.getElapsedTimeF32() >= SEND_STATS_PERIOD && !gDisconnected)
                {
-                        llinfos << "Transmitting sessions stats" << llendl;
+                        static LLFrameStatsTimer viewer_stats_timer(SEND_STATS_PERIOD);
-                        send_stats();
+                        reset_statistics();
-                        viewer_stats_timer.reset();
-                } */
+                        // Update session stats every large chunk of time
+                        // *FIX: (???) SAMANTHA
+                        /* or don't! part of a larger effort to waste less CPU cycles. -Patrick Sapinski (Sunday, November 29, 2009)*/
+                        if (viewer_stats_timer.getElapsedTimeF32() >= SEND_STATS_PERIOD )
+                        {
+                                llinfos << "Transmitting sessions stats" << llendl;
+                                send_stats();
+                                viewer_stats_timer.reset();
+                        } 
+                }
                // Print the object debugging stats
                static LLFrameTimer object_debug_timer;
@@ -3518,6 +3562,8 @@ void LLAppViewer::idle()
            // floating throughout the various object lists.
            //
    
+                idleNameCache();
            gFrameStats.start(LLFrameStats::IDLE_NETWORK);
                stop_glerror();
                idleNetwork();
@@ -3732,6 +3778,10 @@ void LLAppViewer::idle()
                        const F32 max_audio_decode_time = 0.002f; // 2 ms decode time
                        gAudiop->idle(max_audio_decode_time);
                }
+                // update streaming audio
+                if (gAudioStream)
+                        gAudioStream->updateInternetStream();
        }
        
@@ -3895,6 +3945,60 @@ void LLAppViewer::sendLogoutRequest()
        }
 }
+void LLAppViewer::idleNameCache()
+{
+        // Neither old nor new name cache can function before agent has a region
+        LLViewerRegion* region = gAgent.getRegion();
+        if (!region) return;
+        // deal with any queued name requests and replies.
+        gCacheName->processPending();
+        // Can't run the new cache until we have the list of capabilities
+        // for the agent region, and can therefore decide whether to use
+        // display names or fall back to the old name system.
+        if (!region->capabilitiesReceived()) return;
+        // Agent may have moved to a different region, so need to update cap URL
+        // for name lookups.  Can't do this in the cap grant code, as caps are
+        // granted to neighbor regions before the main agent gets there.  Can't
+        // do it in the move-into-region code because cap not guaranteed to be
+        // granted yet, for example on teleport.
+        bool had_capability = LLAvatarNameCache::hasNameLookupURL();
+        std::string name_lookup_url;
+        name_lookup_url.reserve(128); // avoid a memory allocation below
+        name_lookup_url = region->getCapability("GetDisplayNames");
+        bool have_capability = !name_lookup_url.empty();
+        if (have_capability)
+        {
+                // we have support for display names, use it
+            U32 url_size = name_lookup_url.size();
+            // capabilities require URLs with slashes before query params:
+            // https://<host>:<port>/cap/<uuid>/?ids=<blah>
+            // but the caps are granted like:
+            // https://<host>:<port>/cap/<uuid>
+            if (url_size > 0 && name_lookup_url[url_size-1] != '/')
+            {
+                    name_lookup_url += '/';
+            }
+                LLAvatarNameCache::setNameLookupURL(name_lookup_url);
+        }
+        else
+        {
+                // Display names not available on this region
+                LLAvatarNameCache::setNameLookupURL( std::string() );
+        }
+        // Error recovery - did we change state?
+        if (had_capability != have_capability)
+        {
+                // name tags are persistant on screen, so make sure they refresh
+                LLVOAvatar::invalidateNameTags();
+        }
+        LLAvatarNameCache::idle();
+}
 //
 // Handle messages, and all message related stuff
 //
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index 7b3230a..42c49de 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -192,6 +192,7 @@ private:
    
    void idle(); 
    void idleShutdown();
+    void idleNameCache();
    void idleNetwork();
    void sendLogoutRequest();
diff --git a/linden/indra/newview/llappviewerlinux.cpp b/linden/indra/newview/llappviewerlinux.cpp
index 307f925..88ddf7e 100644
--- a/linden/indra/newview/llappviewerlinux.cpp
+++ b/linden/indra/newview/llappviewerlinux.cpp
@@ -129,6 +129,7 @@ int main( int argc, char **argv )
        }
        delete viewer_app_ptr;
        viewer_app_ptr = NULL;
        return 0;
 }
diff --git a/linden/indra/newview/llappviewermacosx.cpp b/linden/indra/newview/llappviewermacosx.cpp
index 91de066..d81b6e3 100644
--- a/linden/indra/newview/llappviewermacosx.cpp
+++ b/linden/indra/newview/llappviewermacosx.cpp
@@ -119,6 +119,7 @@ int main( int argc, char **argv )
        }
        delete viewer_app_ptr;
        viewer_app_ptr = NULL;
        return 0;
 }
diff --git a/linden/indra/newview/llappviewerwin32.cpp b/linden/indra/newview/llappviewerwin32.cpp
index 0d5b884..1f042bd 100644
--- a/linden/indra/newview/llappviewerwin32.cpp
+++ b/linden/indra/newview/llappviewerwin32.cpp
@@ -78,31 +78,6 @@ extern "C" {
 #endif
 #endif
-// Force Imprudence to link against the correct boost libraries -- McCabe
-#if defined(_MSC_VER)
-#if _MSC_VER >= 1500
-#ifdef LL_DEBUG
-#pragma comment( lib, "libboost_signals-vc90-mt-gd-1_36.lib" )
-#pragma comment( lib, "libboost_regex-vc90-mt-gd-1_36.lib" )
-#pragma comment( lib, "libboost_program_options-vc90-mt-gd-1_36.lib" )
-#else
-#pragma comment( lib, "libboost_signals-vc90-mt-1_36.lib" )
-#pragma comment( lib, "libboost_regex-vc90-mt-1_36.lib" )
-#pragma comment( lib, "libboost_program_options-vc90-mt-1_36.lib" )
-#endif
-#elif _MSC_VER >= 1400
-#ifdef LL_DEBUG
-#pragma comment( lib, "libboost_signals-vc80-mt-gd-1_36.lib" )
-#pragma comment( lib, "libboost_regex-vc80-mt-gd-1_36.lib" )
-#pragma comment( lib, "libboost_program_options-vc80-mt-gd-1_36.lib" )
-#else
-#pragma comment( lib, "libboost_signals-vc80-mt-1_36.lib" )
-#pragma comment( lib, "libboost_regex-vc80-mt-1_36.lib" )
-#pragma comment( lib, "libboost_program_options-vc80-mt-1_36.lib" )
-#endif
-#endif
-#endif
 const std::string LLAppViewerWin32::sWindowClass = "Imprudence";
 LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *exception_infop)
diff --git a/linden/indra/newview/llcallingcard.cpp b/linden/indra/newview/llcallingcard.cpp
index 15be0eb..f1328be 100644
--- a/linden/indra/newview/llcallingcard.cpp
+++ b/linden/indra/newview/llcallingcard.cpp
@@ -613,6 +613,25 @@ void LLAvatarTracker::processChange(LLMessageSystem* msg)
                                        LLSD args;
                                        if(gCacheName->getName(agent_id, first, last))
                                        {
+                                                if (LLAvatarNameCache::useDisplayNames() && !gSavedSettings.getBOOL("LegacyNamesForFriends"))
+                                                {
+                                                        LLAvatarName avatar_name;
+                                                        if (LLAvatarNameCache::get(agent_id, &avatar_name))
+                                                        {
+                                                                // Always show "Display Name [Legacy Name]" for security reasons
+                                                                first = avatar_name.getNames();
+                                                                size_t i = first.find(" ");
+                                                                if (i != std::string::npos)
+                                                                {
+                                                                        last = first.substr(i + 1);
+                                                                        first = first.substr(0, i);
+                                                                }
+                                                                else
+                                                                {
+                                                                        last = "";
+                                                                }
+                                                        }
+                                                }
                                                args["FIRST_NAME"] = first;
                                                args["LAST_NAME"] = last;       
                                        }
@@ -669,6 +688,31 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
                                        std::string first, last;
                                        if(gCacheName->getName(agent_id, first, last))
                                        {
+                                                if (LLAvatarNameCache::useDisplayNames() && !gSavedSettings.getBOOL("LegacyNamesForFriends"))
+                                                {
+                                                        LLAvatarName avatar_name;
+                                                        if (LLAvatarNameCache::get(agent_id, &avatar_name))
+                                                        {
+                                                                if (LLAvatarNameCache::useDisplayNames() == 1)
+                                                                {
+                                                                        first = avatar_name.mDisplayName;
+                                                                }
+                                                                else
+                                                                {
+                                                                        first = avatar_name.getNames();
+                                                                }
+                                                                size_t i = first.find(" ");
+                                                                if (i != std::string::npos)
+                                                                {
+                                                                        last = first.substr(i + 1);
+                                                                        first = first.substr(0, i);
+                                                                }
+                                                                else
+                                                                {
+                                                                        last = "";
+                                                                }
+                                                        }
+                                                }
                                                notify = TRUE;
                                                args["FIRST"] = first;
                                                args["LAST"] = last;
@@ -745,6 +789,12 @@ void LLAvatarTracker::processTerminateFriendship(LLMessageSystem* msg, void**)
        }
 }
+void LLAvatarTracker::dirtyBuddies()
+{
+        mModifyMask |=  LLFriendObserver::REMOVE | LLFriendObserver::ADD;
+        notifyObservers();
+}
 ///----------------------------------------------------------------------------
 /// Tracking Data
 ///----------------------------------------------------------------------------
diff --git a/linden/indra/newview/llcallingcard.h b/linden/indra/newview/llcallingcard.h
index d3f53c6..d5496ae 100644
--- a/linden/indra/newview/llcallingcard.h
+++ b/linden/indra/newview/llcallingcard.h
@@ -122,6 +122,9 @@ public:
        // deal with termination of friendhsip
        void terminateBuddy(const LLUUID& id);
+        // flag the buddy list dirty to force an update
+        void dirtyBuddies();
        // get full info
        const LLRelationship* getBuddyInfo(const LLUUID& id) const;
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index a59fa06..ec4e294 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -1181,7 +1181,7 @@ BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const std::string& filename
                        break;
                case FFSAVE_RAW:
                        caption += add_simple_pattern_filter_to_gtkchooser
-                                (picker, "*.raw", LLTrans::getString("dot_raw_file") + " (*.raw)");
+                                (picker, "*.raw", LLTrans::getString("raw_file") + " (*.raw)");
                        suggest_ext = ".raw";
                        break;
                case FFSAVE_J2C:
diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index 18efa9e..f482d1c 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -390,3 +390,31 @@ void LLFirstUse::voiceLicenseAgreement()
                LLStartUp::setStartupState(STATE_LOGIN_AUTH_INIT);
        }
 }
+void LLFirstUse::callbackPrivacy(const LLSD& notification, const LLSD& response)
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+        if ( 0 == option )
+        {
+                gSavedSettings.setWarning("FirstPrivacy", FALSE);
+                LLStartUp::setStartupState(STATE_PRIVACY_LECTURED);
+        }
+        if ( 1 == option )
+        {
+                LLStartUp::resetLogin();
+        }
+}
+// static
+void LLFirstUse::Privacy()
+{
+        if (gSavedSettings.getWarning("FirstPrivacy"))
+        {
+                LLNotifications::instance().add("FirstPrivacy", LLSD(), LLSD(), callbackPrivacy);
+        }
+        else
+        {
+                LLStartUp::setStartupState(STATE_PRIVACY_LECTURED);
+        }
+}
+\ No newline at end of file
diff --git a/linden/indra/newview/llfirstuse.h b/linden/indra/newview/llfirstuse.h
index 42443ff..8c2ca35 100644
--- a/linden/indra/newview/llfirstuse.h
+++ b/linden/indra/newview/llfirstuse.h
@@ -116,7 +116,8 @@ public:
        static void callbackClientTags(const LLSD& notification, const LLSD& response);
        static void ClientTags();
        static void voiceLicenseAgreement();
-        
+        static void callbackPrivacy(const LLSD& notification, const LLSD& response);
+        static void Privacy();
 protected:
        static std::set<std::string> sConfigVariables;
diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp
index 59de717..75cf176 100644
--- a/linden/indra/newview/llfloateractivespeakers.cpp
+++ b/linden/indra/newview/llfloateractivespeakers.cpp
@@ -92,18 +92,19 @@ LLSpeaker::LLSpeaker(const LLUUID& id, const std::string& name, const ESpeakerTy
 void LLSpeaker::lookupName()
 {
-        gCacheName->getName(mID, onAvatarNameLookup, new LLHandle<LLSpeaker>(getHandle()));
+        LLAvatarNameCache::get(mID, boost::bind(&LLSpeaker::onAvatarNameLookup, _1, _2, new LLHandle<LLSpeaker>(getHandle())));
 }
 //static 
-void LLSpeaker::onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* user_data)
+void LLSpeaker::onAvatarNameLookup(const LLUUID& id, const LLAvatarName& avatar_name, void* user_data)
 {
        LLSpeaker* speaker_ptr = ((LLHandle<LLSpeaker>*)user_data)->get();
        delete (LLHandle<LLSpeaker>*)user_data;
        if (speaker_ptr)
        {
-                speaker_ptr->mDisplayName = first + " " + last;
+                // Always show "Display Name [Legacy Name]" for security reasons
+                speaker_ptr->mDisplayName = avatar_name.getNames();
 // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-1.0.0g
                // TODO-RLVa: this seems to get called per frame which is very likely an LL bug that will eventuall get fixed
                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
diff --git a/linden/indra/newview/llfloateractivespeakers.h b/linden/indra/newview/llfloateractivespeakers.h
index b2c44e2..dc3dd73 100644
--- a/linden/indra/newview/llfloateractivespeakers.h
+++ b/linden/indra/newview/llfloateractivespeakers.h
@@ -33,6 +33,7 @@
 #ifndef LL_LLFLOATERACTIVESPEAKERS_H
 #define LL_LLFLOATERACTIVESPEAKERS_H
+#include "llavatarnamecache.h"
 #include "llfloater.h"
 #include "llmemory.h"
 #include "llvoiceclient.h"
@@ -73,7 +74,7 @@ public:
        ~LLSpeaker() {};
        void lookupName();
-        static void onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* user_data);
+        static void onAvatarNameLookup(const LLUUID& id, const LLAvatarName& avatar_name, void* user_data);
        ESpeakerStatus  mStatus;                        // current activity status in speech group
        F32                             mLastSpokeTime;         // timestamp when this speaker last spoke
diff --git a/linden/indra/newview/llfloateravatarinfo.cpp b/linden/indra/newview/llfloateravatarinfo.cpp
index 0618875..13805fb 100644
--- a/linden/indra/newview/llfloateravatarinfo.cpp
+++ b/linden/indra/newview/llfloateravatarinfo.cpp
@@ -122,7 +122,7 @@ LLFloaterAvatarInfo::LLFloaterAvatarInfo(const std::string& name, const LLRect &
        }
        gAvatarInfoInstances.addData(avatar_id, this); // must be done before callback below is called.
-        gCacheName->get(avatar_id, FALSE, callbackLoadAvatarName);
+        LLAvatarNameCache::get(avatar_id, boost::bind(&LLFloaterAvatarInfo::callbackLoadAvatarName, _1, _2));
 }
 // virtual
@@ -242,18 +242,16 @@ void LLFloaterAvatarInfo::showProfileCallback(S32 option, void *userdata)
 // static
 void LLFloaterAvatarInfo::callbackLoadAvatarName(const LLUUID& id,
-                                                                                                 const std::string& first,
+                                                                                                 const LLAvatarName& avatar_name)
-                                                                                                 const std::string& last,
-                                                                                                 BOOL is_group,
-                                                                                                 void* data)
 {
        LLFloaterAvatarInfo *floater = gAvatarInfoInstances.getIfThere(id);
        if (floater)
        {
                // Build a new title including the avatar name.
+                // Always show "Display Name [Legacy Name]" for security reasons
                std::ostringstream title;
-                title << first << " " << last << " - " << floater->getTitle();
+                title << avatar_name.getNames() << " - " << floater->getTitle();
                floater->setTitle(title.str());
        }
 }
diff --git a/linden/indra/newview/llfloateravatarinfo.h b/linden/indra/newview/llfloateravatarinfo.h
index 1cc17d1..f65e1f4 100644
--- a/linden/indra/newview/llfloateravatarinfo.h
+++ b/linden/indra/newview/llfloateravatarinfo.h
@@ -39,6 +39,7 @@
 #ifndef LL_LLFLOATERAVATARINFO_H
 #define LL_LLFLOATERAVATARINFO_H
+#include "llavatarnamecache.h"
 #include "llfloater.h"
 #include "llpreview.h"
 #include "lluuid.h"
@@ -91,8 +92,7 @@ public:
        static LLFloaterAvatarInfo* getInstance(const LLUUID &id);
        static void showProfileCallback(S32 option, void *userdata);
-        static void callbackLoadAvatarName(const LLUUID& id,
+        static void callbackLoadAvatarName(const LLUUID& agent_id, const LLAvatarName& avatar_name);
-                const std::string& first, const std::string& last, BOOL is_group, void* data);
        void resetGroupList();
 private:
diff --git a/linden/indra/newview/llfloaterchatterbox.cpp b/linden/indra/newview/llfloaterchatterbox.cpp
index 1ef75d1..ba1c83c 100644
--- a/linden/indra/newview/llfloaterchatterbox.cpp
+++ b/linden/indra/newview/llfloaterchatterbox.cpp
@@ -43,6 +43,7 @@
 #include "llviewercontrol.h"
 #include "llimview.h"
 #include "llimpanel.h"
+#include "llcallingcard.h"
 //
 // LLFloaterMyFriends
@@ -218,6 +219,8 @@ void LLFloaterChatterBox::draw()
 void LLFloaterChatterBox::onOpen()
 {
        gSavedSettings.setBOOL("ShowCommunicate", TRUE);
+        // Force a refresh to get latest display names in the new IM panel.
+        LLAvatarTracker::instance().dirtyBuddies();
 }
 void LLFloaterChatterBox::onClose(bool app_quitting)
diff --git a/linden/indra/newview/llfloatercustomize.cpp b/linden/indra/newview/llfloatercustomize.cpp
index db51556..21dfc36 100644
--- a/linden/indra/newview/llfloatercustomize.cpp
+++ b/linden/indra/newview/llfloatercustomize.cpp
@@ -448,9 +448,7 @@ LLPanelEditWearable::LLPanelEditWearable( EWearableType type )
 BOOL LLPanelEditWearable::postBuild()
 {
        LLAssetType::EType asset_type = LLWearable::typeToAssetType( mType );
-        std::string icon_name = (asset_type == LLAssetType::AT_CLOTHING ?
+        std::string icon_name = get_item_icon_name(asset_type, LLInventoryType::IT_WEARABLE, mType, FALSE);
-                                                                                 "inv_item_clothing.tga" :
-                                                                                 "inv_item_skin.tga" );
        childSetValue("icon", icon_name);
        childSetAction("Create New", LLPanelEditWearable::onBtnCreateNew, this );
@@ -553,7 +551,7 @@ void LLPanelEditWearable::setSubpart( ESubpart subpart )
                        param = (LLViewerVisualParam *)avatar->getNextVisualParam())
                {
                        if (param->getID() == -1
-                                || param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE 
+                                || !param->isTweakable()
                                || param->getEditGroup() != part->mEditGroup 
                                || !(param->getSex() & avatar_sex))
                        {
@@ -763,7 +761,6 @@ void LLPanelEditWearable::onColorCommit( LLUICtrl* ctrl, void* userdata )
        }
 }
 void LLPanelEditWearable::initPreviousTextureList()
 {
        initPreviousTextureListEntry(TEX_LOWER_ALPHA);
@@ -2338,6 +2335,7 @@ void LLFloaterCustomize::initWearablePanels()
                panel->addTextureDropTarget(TEX_HEAD_TATTOO, "Head Tattoo",
                                                                        LLUUID::null,
                                                                        TRUE);
+                panel->addColorSwatch(TEX_LOWER_TATTOO, "Color/Tint");
        }
 }
diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp
index 8018c31..7c8ddf1 100644
--- a/linden/indra/newview/llfloaterdirectory.cpp
+++ b/linden/indra/newview/llfloaterdirectory.cpp
@@ -466,7 +466,9 @@ void LLFloaterDirectory::setVisible(BOOL visible)
 void LLFloaterDirectory::onClose(bool app_quitting)
 {
-        setVisible(FALSE);
+        LLFloater::onClose(app_quitting);
+        //setVisible(FALSE); //meaning you hide 3 web browsers - one SLPlugin each
 }
 // static
diff --git a/linden/indra/newview/llfloaterdisplayname.cpp b/linden/indra/newview/llfloaterdisplayname.cpp
new file mode 100644
index 0000000..31ceda9
--- /dev/null
+++ b/linden/indra/newview/llfloaterdisplayname.cpp
@@ -0,0 +1,224 @@
+/** 
+ * @file llfloaterdisplayname.cpp
+ * @author Leyla Farazha
+ * @brief Implementation of the LLFloaterDisplayName class.
+ *
+ * $LicenseInfo:firstyear=2002&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+#include "llviewerprecompiledheaders.h"
+#include "llfloater.h"
+#include "llnotifications.h"
+#include "llviewerdisplayname.h"
+#include "llnotify.h"
+#include "llfloaterdisplayname.h"
+#include "llavatarnamecache.h"
+#include "lluictrlfactory.h"
+#include "llviewercontrol.h"
+#include "llagent.h"
+LLFloaterDisplayName* LLFloaterDisplayName::sInstance = NULL;
+LLFloaterDisplayName::LLFloaterDisplayName() : LLFloater(std::string("Display Name"))
+{
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_display_name.xml");
+        LLFloaterDisplayName::sInstance = this;
+}
+LLFloaterDisplayName::~LLFloaterDisplayName()
+{
+        LLFloaterDisplayName::sInstance = NULL;
+}
+void LLFloaterDisplayName::show()
+{
+        if (!LLFloaterDisplayName::sInstance)
+        {
+                LLFloaterDisplayName::sInstance = new LLFloaterDisplayName();
+        }
+        LLFloaterDisplayName::sInstance->open();
+}
+void LLFloaterDisplayName::onOpen()
+{
+        getChild<LLUICtrl>("display_name_editor")->clear();
+        getChild<LLUICtrl>("display_name_confirm")->clear();
+        LLAvatarName av_name;
+        LLAvatarNameCache::get(gAgent.getID(), &av_name);
+        F64 now_secs = LLDate::now().secondsSinceEpoch();
+        if (now_secs < av_name.mNextUpdate)
+        {
+                // ...can't update until some time in the future
+                F64 next_update_local_secs = av_name.mNextUpdate;
+                std::string next_update_string;
+#ifdef LOCALIZED_TIME
+                timeToFormattedString((time_t)next_update_local_secs,
+                                                          gSavedSettings.getString("LongDateFormat"),
+                                                          next_update_string);
+#else
+                LLDate next_update_local(next_update_local_secs);
+                next_update_string = next_update_local.asString();
+#endif
+                getChild<LLUICtrl>("lockout_text")->setTextArg("[TIME]", next_update_string);
+                getChild<LLUICtrl>("lockout_text")->setVisible(true);
+                getChild<LLUICtrl>("now_ok_text")->setVisible(false);
+                getChild<LLUICtrl>("save_btn")->setEnabled(false);
+                getChild<LLUICtrl>("display_name_editor")->setEnabled(false);
+                getChild<LLUICtrl>("display_name_confirm")->setEnabled(false);
+                getChild<LLUICtrl>("cancel_btn")->setFocus(TRUE);
+                
+        }
+        else
+        {
+                getChild<LLUICtrl>("lockout_text")->setVisible(false);
+                getChild<LLUICtrl>("now_ok_text")->setVisible(true);
+                getChild<LLUICtrl>("save_btn")->setEnabled(true);
+                getChild<LLUICtrl>("display_name_editor")->setEnabled(true);
+                getChild<LLUICtrl>("display_name_confirm")->setEnabled(true);
+        }
+}
+BOOL LLFloaterDisplayName::postBuild()
+{
+        childSetAction("reset_btn", onReset, this);
+        childSetAction("cancel_btn", onCancel, this);
+        childSetAction("save_btn", onSave, this);
+        center();
+        return TRUE;
+}
+void LLFloaterDisplayName::onCacheSetName(bool success,
+                                                                                  const std::string& reason,
+                                                                                  const LLSD& content)
+{
+        if (success)
+        {
+                // Inform the user that the change took place, but will take a while
+                // to percolate.
+                LLSD args;
+                args["DISPLAY_NAME"] = content["display_name"];
+                LLNotifications::instance().add("SetDisplayNameSuccess", args);
+                // Re-fetch my name, as it may have been sanitized by the service
+                //LLAvatarNameCache::get(getAvatarId(),
+                //      boost::bind(&LLPanelMyProfileEdit::onNameCache, this, _1, _2));
+                return;
+        }
+        // Request failed, notify the user
+        std::string error_tag = content["error_tag"].asString();
+        llinfos << "set name failure error_tag " << error_tag << llendl;
+        // We might have a localized string for this message
+        // error_args will usually be empty from the server.
+        if (!error_tag.empty()
+                && LLNotifications::getInstance()->templateExists(error_tag))
+        {
+                LLNotifications::instance().add(error_tag);
+                return;
+        }
+        // The server error might have a localized message for us
+        std::string lang_code = LLUI::getLanguage();
+        LLSD error_desc = content["error_description"];
+        if (error_desc.has( lang_code ))
+        {
+                LLSD args;
+                args["MESSAGE"] = error_desc[lang_code].asString();
+                LLNotifications::instance().add("GenericAlert", args);
+                return;
+        }
+        // No specific error, throw a generic one
+        LLNotifications::instance().add("SetDisplayNameFailedGeneric");
+}
+void LLFloaterDisplayName::onCancel(void* data)
+{
+        LLFloaterDisplayName* self = (LLFloaterDisplayName*)data;
+        self->setVisible(false);
+}
+void LLFloaterDisplayName::onReset(void* data)
+{
+        LLFloaterDisplayName* self = (LLFloaterDisplayName*)data;
+        if (LLAvatarNameCache::useDisplayNames())
+        {
+                LLViewerDisplayName::set("",
+                        boost::bind(&LLFloaterDisplayName::onCacheSetName, self, _1, _2, _3));
+        }       
+        else
+        {
+                LLNotifications::instance().add("SetDisplayNameFailedGeneric");
+        }
+        self->setVisible(false);
+}
+void LLFloaterDisplayName::onSave(void* data)
+{
+        LLFloaterDisplayName* self = (LLFloaterDisplayName*)data;
+        std::string display_name_utf8 = self->getChild<LLUICtrl>("display_name_editor")->getValue().asString();
+        std::string display_name_confirm = self->getChild<LLUICtrl>("display_name_confirm")->getValue().asString();
+        if (display_name_utf8.compare(display_name_confirm))
+        {
+                LLNotifications::instance().add("SetDisplayNameMismatch");
+                return;
+        }
+        const U32 DISPLAY_NAME_MAX_LENGTH = 31; // characters, not bytes
+        LLWString display_name_wstr = utf8string_to_wstring(display_name_utf8);
+        if (display_name_wstr.size() > DISPLAY_NAME_MAX_LENGTH)
+        {
+                LLSD args;
+                args["LENGTH"] = llformat("%d", DISPLAY_NAME_MAX_LENGTH);
+                LLNotifications::instance().add("SetDisplayNameFailedLength", args);
+                return;
+        }
+        if (LLAvatarNameCache::useDisplayNames())
+        {
+                LLViewerDisplayName::set(display_name_utf8,
+                        boost::bind(&LLFloaterDisplayName::onCacheSetName, self, _1, _2, _3));  
+        }
+        else
+        {
+                LLNotifications::instance().add("SetDisplayNameFailedGeneric");
+        }
+        self->setVisible(false);
+}
diff --git a/linden/indra/newview/llfloaterdisplayname.h b/linden/indra/newview/llfloaterdisplayname.h
new file mode 100644
index 0000000..4b25670
--- /dev/null
+++ b/linden/indra/newview/llfloaterdisplayname.h
@@ -0,0 +1,48 @@
+/** 
+ * @file llfloaterdisplayname.h
+ *
+ * $LicenseInfo:firstyear=2009&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+#ifndef LLFLOATERDISPLAYNAME_H
+#define LLFLOATERDISPLAYNAME_H
+class LLFloaterDisplayName : public LLFloater
+{
+public:
+        LLFloaterDisplayName();
+        virtual ~LLFloaterDisplayName();
+        /* virtual */ BOOL postBuild();
+        /* virtual */ void onOpen();
+        static void show();
+        static void onSave(void* data);
+        static void onReset(void* data);
+        static void onCancel(void* data);
+private:
+        static LLFloaterDisplayName* sInstance;
+        void onCacheSetName(bool success, const std::string& reason, const LLSD& content);
+};
+#endif
diff --git a/linden/indra/newview/llfloaterfriends.cpp b/linden/indra/newview/llfloaterfriends.cpp
index c33deae..84ba81e 100644
--- a/linden/indra/newview/llfloaterfriends.cpp
+++ b/linden/indra/newview/llfloaterfriends.cpp
@@ -39,6 +39,7 @@
 #include <sstream>
+#include "llavatarnamecache.h"
 #include "lldir.h"
 #include "llagent.h"
@@ -254,6 +255,24 @@ BOOL LLPanelFriends::addFriend(const LLUUID& agent_id)
        std::string fullname;
        BOOL have_name = gCacheName->getFullName(agent_id, fullname);
+        if (have_name)
+        {
+                if (LLAvatarNameCache::useDisplayNames() && !gSavedSettings.getBOOL("LegacyNamesForFriends"))
+                {
+                        LLAvatarName avatar_name;
+                        if (LLAvatarNameCache::get(agent_id, &avatar_name))
+                        {
+                                if (LLAvatarNameCache::useDisplayNames() == 1)
+                                {
+                                        fullname = avatar_name.mDisplayName;
+                                }
+                                else
+                                {
+                                        fullname = avatar_name.getNames();
+                                }
+                        }
+                }
+        }
        
        LLSD element;
        element["id"] = agent_id;
@@ -332,6 +351,24 @@ BOOL LLPanelFriends::updateFriendItem(const LLUUID& agent_id, const LLRelationsh
        std::string fullname;
        BOOL have_name = gCacheName->getFullName(agent_id, fullname);
+        if (have_name)
+        {
+                if (LLAvatarNameCache::useDisplayNames() && !gSavedSettings.getBOOL("LegacyNamesForFriends"))
+                {
+                        LLAvatarName avatar_name;
+                        if (LLAvatarNameCache::get(agent_id, &avatar_name))
+                        {
+                                if (LLAvatarNameCache::useDisplayNames() == 1)
+                                {
+                                        fullname = avatar_name.mDisplayName;
+                                }
+                                else
+                                {
+                                        fullname = avatar_name.getNames();
+                                }
+                        }
+                }
+        }
        
        // Name of the status icon to use
        std::string statusIcon;
@@ -790,6 +827,25 @@ void LLPanelFriends::onClickRemove(void* user_data)
                        std::string first, last;
                        if(gCacheName->getName(agent_id, first, last))
                        {
+                                if (LLAvatarNameCache::useDisplayNames() && !gSavedSettings.getBOOL("LegacyNamesForFriends"))
+                                {
+                                        LLAvatarName avatar_name;
+                                        if (LLAvatarNameCache::get(agent_id, &avatar_name))
+                                        {
+                                                // Always show "Display Name [Legacy Name]" for security reasons
+                                                first = avatar_name.getNames();
+                                                size_t i = first.find(" ");
+                                                if (i != std::string::npos)
+                                                {
+                                                        last = first.substr(i + 1);
+                                                        first = first.substr(0, i);
+                                                }
+                                                else
+                                                {
+                                                        last = "";
+                                                }
+                                        }
+                                }
                                args["FIRST_NAME"] = first;
                                args["LAST_NAME"] = last;       
                        }
@@ -854,6 +910,25 @@ void LLPanelFriends::confirmModifyRights(rights_map_t& ids, EGrantRevoke command
                        std::string first, last;
                        if(gCacheName->getName(agent_id, first, last))
                        {
+                                if (LLAvatarNameCache::useDisplayNames() && !gSavedSettings.getBOOL("LegacyNamesForFriends"))
+                                {
+                                        LLAvatarName avatar_name;
+                                        if (LLAvatarNameCache::get(agent_id, &avatar_name))
+                                        {
+                                                // Always show "Display Name [Legacy Name]" for security reasons
+                                                first = avatar_name.getNames();
+                                                size_t i = first.find(" ");
+                                                if (i != std::string::npos)
+                                                {
+                                                        last = first.substr(i + 1);
+                                                        first = first.substr(0, i);
+                                                }
+                                                else
+                                                {
+                                                        last = "";
+                                                }
+                                        }
+                                }
                                args["FIRST_NAME"] = first;
                                args["LAST_NAME"] = last;       
                        }
diff --git a/linden/indra/newview/llfloaternewim.cpp b/linden/indra/newview/llfloaternewim.cpp
index 48920c1..272cb53 100644
--- a/linden/indra/newview/llfloaternewim.cpp
+++ b/linden/indra/newview/llfloaternewim.cpp
@@ -38,10 +38,9 @@
 #include "lltabcontainer.h"
 #include "llimview.h"
-S32 COL_1_WIDTH = 200;
+S32 COL_1_WIDTH = 400;
 static std::string sOnlineDescriptor = "*";
-static std::string sNameFormat = "[FIRST] [LAST]";
 LLFloaterNewIM::LLFloaterNewIM()
 {
@@ -69,7 +68,6 @@ BOOL LLFloaterNewIM::postBuild()
                        llwarns << "LLUICtrlFactory::getNameListByName() returned NULL for 'user_list'" << llendl;
                }
                sOnlineDescriptor = getString("online_descriptor");
-                sNameFormat = getString("name_format");
                setDefaultBtn("start_btn");
                return TRUE;
        }       
@@ -135,11 +133,8 @@ void LLFloaterNewIM::addGroup(const LLUUID& uuid, void* data, BOOL bold, BOOL on
 void LLFloaterNewIM::addAgent(const LLUUID& uuid, void* data, BOOL online)
 {
-        std::string first, last;
+        std::string fullname;
-        gCacheName->getName(uuid, first, last);
+        gCacheName->getFullName(uuid, fullname);
-        LLUIString fullname = sNameFormat;
-        fullname.setArg("[FIRST]", first);
-        fullname.setArg("[LAST]", last);
        LLSD row;
        row["id"] = uuid;
@@ -184,13 +179,20 @@ void LLFloaterNewIM::onStart(void* userdata)
                const LLScrollListCell* cell = item->getColumn(0);
                std::string name(cell->getValue());
-                // *NOTE: Do a live detrmination of what type of session it
+                // *NOTE: Do a live determination of what type of session it
                // should be. If we restrict the new im panel to online users,
                // then we can remove some of this code.
                EInstantMessage type;
                EInstantMessage* t = (EInstantMessage*)item->getUserdata();
                if(t) type = (*t);
                else type = LLIMMgr::defaultIMTypeForAgent(item->getUUID());
+                if (type != IM_SESSION_GROUP_START)
+                {
+                        // Needed to avoid catching a display name, which would
+                        // make us use a wrong IM log file...
+                        gCacheName->getFullName(item->getUUID(), name);
+                }
                gIMMgr->addSession(name, type, item->getUUID());
                make_ui_sound("UISndStartIM");
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index 0cb35e3..2aed361 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -1259,7 +1259,9 @@ void LLFloaterTools::onClickLink(void* data)
        }
        S32 max_linked_prims = 0;
-        if(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()->usePhysics())
+        LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject();
+        if(object && object->usePhysics())
        {
                //Physical - use phys prim limit
                max_linked_prims = gHippoLimits->getMaxPhysLinkedPrims();
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index 10d27cd..4f248e4 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -253,10 +253,29 @@ void LLHoverView::updateText()
                        LLNameValue* lastname =  hit_object->getNVPair("LastName");
                        if (firstname && lastname)
                        {
+                                std::string complete_name = firstname->getString();
+                                complete_name += " ";
+                                complete_name += lastname->getString();
+                                if (LLAvatarNameCache::useDisplayNames())
+                                {
+                                        LLAvatarName avatar_name;
+                                        if (LLAvatarNameCache::get(hit_object->getID(), &avatar_name))
+                                        {
+                                                if (LLAvatarNameCache::useDisplayNames() == 1)
+                                                {
+                                                        complete_name = avatar_name.mDisplayName;
+                                                }
+                                                else
+                                                {
+                                                        complete_name = avatar_name.getNames();
+                                                }
+                                        }
+                                }
 // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
                                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
                                {
-                                        line = RlvStrings::getAnonym(line.append(firstname->getString()).append(1, ' ').append(lastname->getString()));
+                                        line = RlvStrings::getAnonym(complete_name);
                                }
                                else
                                {
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 41727f2..a3e917f 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -106,6 +106,8 @@ LLVoiceChannel* LLVoiceChannel::sSuspendedVoiceChannel = NULL;
 BOOL LLVoiceChannel::sSuspended = FALSE;
+std::set<LLFloaterIMPanel*> LLFloaterIMPanel::sFloaterIMPanels;
 void session_starter_helper(
        const LLUUID& temp_session_id,
        const LLUUID& other_participant_id,
@@ -1108,6 +1110,7 @@ LLFloaterIMPanel::LLFloaterIMPanel(
        mFirstKeystrokeTimer(),
        mLastKeystrokeTimer()
 {
+        sFloaterIMPanels.insert(this);
        init(session_label);
 }
@@ -1149,6 +1152,7 @@ LLFloaterIMPanel::LLFloaterIMPanel(
 void LLFloaterIMPanel::init(const std::string& session_label)
 {
        mSessionLabel = session_label;
+        mProfileButtonEnabled = FALSE;
        std::string xml_filename;
        switch(mDialog)
@@ -1211,6 +1215,10 @@ void LLFloaterIMPanel::init(const std::string& session_label)
                                                                FALSE);
        setTitle(mSessionLabel);
+        if (mProfileButtonEnabled)
+        {
+                lookupName();
+        }
        mInputEditor->setMaxTextLength(DB_IM_MSG_STR_LEN);
        // enable line history support for instant message bar
@@ -1253,9 +1261,32 @@ void LLFloaterIMPanel::init(const std::string& session_label)
        }
 }
+void LLFloaterIMPanel::lookupName()
+{
+        LLAvatarNameCache::get(mOtherParticipantUUID, boost::bind(&LLFloaterIMPanel::onAvatarNameLookup, _1, _2, this));
+}
+//static 
+void LLFloaterIMPanel::onAvatarNameLookup(const LLUUID& id, const LLAvatarName& avatar_name, void* user_data)
+{
+        LLFloaterIMPanel* self = (LLFloaterIMPanel*)user_data;
+        if (self && sFloaterIMPanels.count(self) != 0)
+        {
+                // Always show "Display Name [Legacy Name]" for security reasons
+                std::string title = avatar_name.getNames();
+                if (!title.empty())
+                {
+                        self->setTitle(title);
+                }
+        }
+}
 LLFloaterIMPanel::~LLFloaterIMPanel()
 {
+        sFloaterIMPanels.erase(this);
        delete mSpeakers;
        mSpeakers = NULL;
        
@@ -1550,8 +1581,9 @@ BOOL LLFloaterIMPanel::inviteToSession(const LLDynamicArray<LLUUID>& ids)
        return TRUE;
 }
-void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4& color, bool log_to_file, const LLUUID& source, const std::string& name)
+void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4& color, bool log_to_file, const LLUUID& source, const std::string& const_name)
 {
+        std::string name = const_name;
        // start tab flashing when receiving im for background session from user
        if (source != LLUUID::null)
        {
@@ -1602,6 +1634,21 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4
                }
                else
                {
+                        if (LLAvatarNameCache::useDisplayNames() && source != LLUUID::null)
+                        {
+                                LLAvatarName avatar_name;
+                                if (LLAvatarNameCache::get(source, &avatar_name))
+                                {
+                                        if (LLAvatarNameCache::useDisplayNames() == 1)
+                                        {
+                                                name = avatar_name.mDisplayName;
+                                        }
+                                        else
+                                        {
+                                                name = avatar_name.getNames();
+                                        }
+                                }
+                        }
                        // Convert the name to a hotlink and add to message.
                        const LLStyleSP &source_style = LLStyleMap::instance().lookupAgent(source);
                        mHistoryEditor->appendStyledText(name,false,prepend_newline,source_style);
@@ -1619,7 +1666,7 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4
                else
                        histstr = name + utf8msg;
-                LLLogChat::saveHistory(getTitle(),histstr);
+                LLLogChat::saveHistory(mSessionLabel, histstr);
        }
        if (!isInVisibleChain())
@@ -2168,6 +2215,21 @@ void LLFloaterIMPanel::sendMsg()
                                {
                                        std::string history_echo;
                                        gAgent.buildFullname(history_echo);
+                                        if (LLAvatarNameCache::useDisplayNames())
+                                        {
+                                                LLAvatarName avatar_name;
+                                                if (LLAvatarNameCache::get(gAgent.getID(), &avatar_name))
+                                                {
+                                                        if (LLAvatarNameCache::useDisplayNames() == 1)
+                                                        {
+                                                                history_echo = avatar_name.mDisplayName;
+                                                        }
+                                                        else
+                                                        {
+                                                                history_echo = avatar_name.getNames();
+                                                        }
+                                                }
+                                        }
                                        // Look for IRC-style emotes here.
                                        std::string prefix = utf8_text.substr(0, 4);
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h
index ddcbdc7..b5a0165 100644
--- a/linden/indra/newview/llimpanel.h
+++ b/linden/indra/newview/llimpanel.h
@@ -33,6 +33,7 @@
 #ifndef LL_IMPANEL_H
 #define LL_IMPANEL_H
+#include "llavatarnamecache.h"
 #include "llfloater.h"
 #include "lllogchat.h"
 #include "lluuid.h"
@@ -194,6 +195,9 @@ public:
                                         EInstantMessage dialog);
        virtual ~LLFloaterIMPanel();
+        void lookupName();
+        static void onAvatarNameLookup(const LLUUID& id, const LLAvatarName& avatar_name, void* user_data);
        /*virtual*/ BOOL postBuild();
        // Check typing timeout timer.
@@ -365,6 +369,8 @@ private:
        typedef std::map<LLUUID, LLStyleSP> styleMap;
        static styleMap mStyleMap;
+        static std::set<LLFloaterIMPanel*> sFloaterIMPanels;
        typedef enum e_im_format
        {
                IM_PANEL_PLAIN,
diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp
index 268e431..b38abe4 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -1523,7 +1523,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
        F32 max_subdivisions = sGridMaxSubdivisionLevel;
        F32 grid_alpha = gSavedSettings.getF32("GridOpacity");
-        F32 max_point_on_scale_line = partToMaxScale(mManipPart, bbox);
+        F32 max_point_on_scale_line = llmin(partToMaxScale(mManipPart, bbox), LLWorld::getInstance()->getRegionWidthInMeters());
        LLVector3 drag_point = gAgent.getPosAgentFromGlobal(mDragPointGlobal);
        updateGridSettings();
diff --git a/linden/indra/newview/llnamelistctrl.cpp b/linden/indra/newview/llnamelistctrl.cpp
index e445df5..e30c129 100644
--- a/linden/indra/newview/llnamelistctrl.cpp
+++ b/linden/indra/newview/llnamelistctrl.cpp
@@ -39,6 +39,7 @@
 #include "llcachename.h"
 #include "llagent.h"
 #include "llinventory.h"
+#include "llviewercontrol.h"
 static LLRegisterWidget<LLNameListCtrl> r("name_list");
@@ -56,7 +57,8 @@ LLNameListCtrl::LLNameListCtrl(const std::string& name,
 :       LLScrollListCtrl(name, rect, cb, userdata, allow_multiple_selection,
                                         draw_border),
        mNameColumnIndex(name_column_index),
-        mAllowCallingCardDrop(FALSE)
+        mAllowCallingCardDrop(FALSE),
+        mUseDisplayNames(FALSE)
 {
        setToolTip(tooltip);
        LLNameListCtrl::sInstances.insert(this);
@@ -77,7 +79,7 @@ BOOL LLNameListCtrl::addNameItem(const LLUUID& agent_id, EAddPosition pos,
        //llinfos << "LLNameListCtrl::addNameItem " << agent_id << llendl;
        std::string fullname;
-        BOOL result = gCacheName->getFullName(agent_id, fullname);
+        BOOL result = getResidentName(agent_id, fullname);
        fullname.append(suffix);
@@ -164,7 +166,7 @@ BOOL LLNameListCtrl::addNameItem(LLScrollListItem* item, EAddPosition pos)
        //llinfos << "LLNameListCtrl::addNameItem " << item->getUUID() << llendl;
        std::string fullname;
-        BOOL result = gCacheName->getFullName(item->getUUID(), fullname);
+        BOOL result = getResidentName(item->getUUID(), fullname);
        LLScrollListCell* cell = (LLScrollListCell*)item->getColumn(mNameColumnIndex);
        ((LLScrollListText*)cell)->setText( fullname );
@@ -199,7 +201,7 @@ LLScrollListItem* LLNameListCtrl::addElement(const LLSD& value, EAddPosition pos
        else // normal resident
        {
                std::string name;
-                if (gCacheName->getFullName(item->getUUID(), name))
+                if (getResidentName(item->getUUID(), name))
                {
                        fullname = name;
                }
@@ -346,6 +348,12 @@ LLView* LLNameListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
                name_list->setAllowCallingCardDrop(allow_calling_card_drop);
        }
+        BOOL use_display_names;
+        if (node->getAttributeBOOL("use_display_names", use_display_names))
+        {
+                name_list->setUseDisplayNames(use_display_names);
+        }
        name_list->setScrollListParameters(node);
        name_list->initFromXML(node, parent);
@@ -456,5 +464,31 @@ LLView* LLNameListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
        return name_list;
 }
+bool LLNameListCtrl::getResidentName(const LLUUID& agent_id, std::string& fullname)
+{
+        std::string name;
+        if (gCacheName->getFullName(agent_id, name))
+        {
+                fullname = name;
+                if (mUseDisplayNames && LLAvatarNameCache::useDisplayNames() && !gSavedSettings.getBOOL("LegacyNamesForFriends"))
+                {
+                        LLAvatarName avatar_name;
+                        if (LLAvatarNameCache::get(agent_id, &avatar_name))
+                        {
+                                if (LLAvatarNameCache::useDisplayNames() == 1)
+                                {
+                                        fullname = avatar_name.mDisplayName;
+                                }
+                                else
+                                {
+                                        fullname = avatar_name.getNames();
+                                }
+                        }
+                }
+                return true;
+        }
+        else
+        {
+                return false;
+        }
+}
diff --git a/linden/indra/newview/llnamelistctrl.h b/linden/indra/newview/llnamelistctrl.h
index beb4ede..d6cf578 100644
--- a/linden/indra/newview/llnamelistctrl.h
+++ b/linden/indra/newview/llnamelistctrl.h
@@ -84,7 +84,12 @@ public:
        void setAllowCallingCardDrop(BOOL b) { mAllowCallingCardDrop = b; }
+        void setUseDisplayNames(BOOL b) { mUseDisplayNames = b; }
 private:
+        bool    getResidentName(const LLUUID& agent_id, std::string& fullname);
+        BOOL    mUseDisplayNames;
        static std::set<LLNameListCtrl*> sInstances;
        S32      mNameColumnIndex;
        BOOL     mAllowCallingCardDrop;
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index b9dc482..06257f0 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -36,6 +36,7 @@
 #include "llnetmap.h"
 #include "indra_constants.h"
+#include "llavatarnamecache.h"
 #include "llui.h"
 #include "llmath.h"             // clampf()
 #include "llfocusmgr.h"
@@ -640,7 +641,29 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
        {
                msg.assign("");
                std::string fullname;
-                if(mClosestAgentToCursor.notNull() && gCacheName->getFullName(mClosestAgentToCursor, fullname))
+                BOOL result = FALSE;
+                if (!LLAvatarNameCache::useDisplayNames())
+                {
+                        result = gCacheName->getFullName(mClosestAgentToCursor, fullname);
+                }
+                else
+                {
+                        LLAvatarName avatar_name;
+                        if (LLAvatarNameCache::get(mClosestAgentToCursor, &avatar_name))
+                        {
+                                result = TRUE;
+                                if (LLAvatarNameCache::useDisplayNames() == 1)
+                                {
+                                        fullname = avatar_name.mDisplayName;
+                                }
+                                else
+                                {
+                                        fullname = avatar_name.getNames(true);
+                                }
+                        }
+                }
+                if(mClosestAgentToCursor.notNull() && result)
                {
 //                      msg.append(fullname);
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-0.2.0b
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index ed406e8..4e1d03e 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -38,7 +38,7 @@
 #include "lloverlaybar.h"
 #include "aoremotectrl.h"
-#include "llaudioengine.h"
+#include "kokuastreamingaudio.h"
 #include "llrender.h"
 #include "llagent.h"
 #include "llbutton.h"
@@ -438,17 +438,16 @@ void LLOverlayBar::toggleMusicPlay(void*)
        if (gOverlayBar->mMusicState != PLAYING)
        {
                gOverlayBar->mMusicState = PLAYING; // desired state
-                if (gAudiop)
+                if (gAudioStream)
                {
                        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
                        if ( parcel )
                        {
                                // this doesn't work properly when crossing parcel boundaries - even when the 
                                // stream is stopped, it doesn't return the right thing - commenting out for now.
-        //                      if ( gAudiop->isInternetStreamPlaying() == 0 )
+        //                      if ( gAudioStream->isInternetStreamPlaying() == 0 )
                                {
-                                        gAudiop->startInternetStream(parcel->getMusicURL());
+                                        gAudioStream->startInternetStream(parcel->getMusicURL());
-//awfixme                                       sTitleObserver.init(parcel->getMusicURL());
                                }
                        }
                }
@@ -456,9 +455,9 @@ void LLOverlayBar::toggleMusicPlay(void*)
        else
        {
                gOverlayBar->mMusicState = STOPPED; // desired state
-                if (gAudiop)
+                if (gAudioStream)
                {
-                        gAudiop->stopInternetStream();
+                        gAudioStream->stopInternetStream();
                }
        }
 }
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index e47ae2a..6b3be29 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -416,6 +416,7 @@ BOOL LLPanelAvatarWeb::postBuild(void)
        childSetControlName("auto_load","AutoLoadWebProfiles");
        mWebBrowser = getChild<LLMediaCtrl>("profile_html");
        mWebBrowser->addObserver(this);
        // links open in internally 
@@ -490,7 +491,17 @@ void LLPanelAvatarWeb::refresh()
                mNavigateTo = "";
        }
 }
+void LLPanelAvatarWeb::onVisibilityChange(BOOL new_visibility)
+{
+        LLPluginClassMedia::EPriority new_priority;
+        if (new_visibility)
+                new_priority = LLPluginClassMedia::PRIORITY_NORMAL;
+        else
+                new_priority = LLPluginClassMedia::PRIORITY_HIDDEN;
+        mWebBrowser->getMediaPlugin()->setPriority(new_priority);
+}
 void LLPanelAvatarWeb::enableControls(BOOL self)
 {       
@@ -1346,7 +1357,33 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
                {
                        name_edit->setText(name);
                }
+                childSetVisible("name", TRUE);
+        }
+        LLNameEditor* complete_name_edit = getChild<LLNameEditor>("complete_name");
+        if (complete_name_edit)
+        {
+                if (LLAvatarNameCache::useDisplayNames())
+                {
+                        LLAvatarName avatar_name;
+                        if (LLAvatarNameCache::get(avatar_id, &avatar_name))
+                        {
+                                // Always show "Display Name [Legacy Name]" for security reasons
+                                complete_name_edit->setText(avatar_name.getNames());
+                        }
+                        else
+                        {
+                                complete_name_edit->setText(name_edit->getText());
+                                LLAvatarNameCache::get(avatar_id, boost::bind(&LLPanelAvatar::completeNameCallback, _1, _2, this));                     
+                        }
+                        childSetVisible("name", FALSE);
+                        childSetVisible("complete_name", TRUE);
+                }
+                else
+                {
+                        childSetVisible("complete_name", FALSE);
+                }
        }
 //      if (avatar_changed)
        {
                // While we're waiting for data off the network, clear out the
@@ -1469,6 +1506,22 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
        }
 }
+void LLPanelAvatar::completeNameCallback(const LLUUID& agent_id,
+                                                                                 const LLAvatarName& avatar_name,
+                                                                                 void *userdata)
+{
+        LLPanelAvatar* self = (LLPanelAvatar*)userdata;
+        if (!LLAvatarNameCache::useDisplayNames() || agent_id != self->mAvatarID)
+        {
+                return;
+        }
+        LLLineEditor* complete_name_edit = self->getChild<LLLineEditor>("complete_name");
+        if (complete_name_edit)
+        {
+                // Always show "Display Name [Legacy Name]" for security reasons
+                complete_name_edit->setText(avatar_name.getNames());
+        }
+}
 void LLPanelAvatar::resetGroupList()
 {
diff --git a/linden/indra/newview/llpanelavatar.h b/linden/indra/newview/llpanelavatar.h
index b687cd8..3a90196 100644
--- a/linden/indra/newview/llpanelavatar.h
+++ b/linden/indra/newview/llpanelavatar.h
@@ -33,6 +33,7 @@
 #ifndef LL_LLPANELAVATAR_H
 #define LL_LLPANELAVATAR_H
+#include "llavatarnamecache.h"
 #include "llpanel.h"
 #include "v3dmath.h"
 #include "lluuid.h"
@@ -76,7 +77,6 @@ public:
        /*virtual*/ void draw();
        LLPanelAvatar* getPanelAvatar() const { return mPanelAvatar; }
        void setDataRequested(bool requested) { mDataRequested = requested; }
        bool isDataRequested() const              { return mDataRequested; }
@@ -143,14 +143,15 @@ public:
        LLPanelAvatarWeb(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
        /*virtual*/ ~LLPanelAvatarWeb();
        /*virtual*/ BOOL        postBuild(void);
        /*virtual*/ void refresh();
+        /*virtual*/ void onVisibilityChange(BOOL new_visibility);
        void enableControls(BOOL own_avatar);
        void setWebURL(std::string url);
        void load(std::string url);
        static void onURLKeystroke(LLLineEditor* editor, void* data);
        static void onCommitLoad(LLUICtrl* ctrl, void* data);
        static void onCommitURL(LLUICtrl* ctrl, void* data);
@@ -335,6 +336,9 @@ private:
        static bool finishUnfreeze(const LLSD& notification, const LLSD& response);
        static void showProfileCallback(S32 option, void *userdata);
+        static void completeNameCallback(const LLUUID& agent_id,
+                                                                         const LLAvatarName& avatar_name,
+                                                                         void *userdata);
        static  void*   createPanelAvatar(void* data);
        static  void*   createFloaterAvatarInfo(void*   data);
diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp
index 342ffec..719a7a0 100644
--- a/linden/indra/newview/llpaneldirfind.cpp
+++ b/linden/indra/newview/llpaneldirfind.cpp
@@ -62,6 +62,7 @@
 #include "lluictrlfactory.h"
 #include "llfloaterdirectory.h"
 #include "llpaneldirbrowser.h"
+#include "llpluginclassmedia.h"
 #include <boost/tokenizer.hpp>
 #if LL_WINDOWS
@@ -196,10 +197,17 @@ void LLPanelDirFind::draw()
 // virtual
 void LLPanelDirFind::onVisibilityChange(BOOL new_visibility)
 {
+        LLPluginClassMedia::EPriority new_priority;
        if (new_visibility)
        {
                mFloaterDirectory->hideAllDetailPanels();
+                new_priority = LLPluginClassMedia::PRIORITY_NORMAL;
        }
+        else
+                new_priority = LLPluginClassMedia::PRIORITY_HIDDEN;
+        mWebBrowser->getMediaPlugin()->setPriority(new_priority);
        LLPanel::onVisibilityChange(new_visibility);
 }
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index fc6073a..70146ce 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -98,6 +98,9 @@ BOOL LLPanelGeneral::postBuild()
        childSetValue("mini_map_notify_chat", gSavedSettings.getBOOL("MiniMapNotifyChatRange"));
        childSetValue("mini_map_notify_sim", gSavedSettings.getBOOL("MiniMapNotifySimRange"));
+//      mDisplayNamesUsage =  gSavedSettings.getU32("DisplayNamesUsage");
+//      mLegacyNamesForFriends =  gSavedSettings.getBOOL("LegacyNamesForFriends");
        getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(gSavedSettings.getColor4("EffectColor"));
        childSetValue("ui_scale_slider", gSavedSettings.getF32("UIScaleFactor"));
@@ -210,6 +213,8 @@ void LLPanelGeneral::apply()
 void LLPanelGeneral::cancel()
 {
+//      gSavedSettings.setU32("DisplayNamesUsage", mDisplayNamesUsage);
+//      gSavedSettings.setBOOL("LegacyNamesForFriends", mDisplayNamesUsage);
 }
 // static
diff --git a/linden/indra/newview/llpanelgeneral.h b/linden/indra/newview/llpanelgeneral.h
index e85fdf8..56cc3de 100644
--- a/linden/indra/newview/llpanelgeneral.h
+++ b/linden/indra/newview/llpanelgeneral.h
@@ -51,6 +51,9 @@ private:
        static void onClickResetUISize(void*);
        static void onClickGrid(void*);
        static void onLocationChanged(LLUICtrl* ctrl, void* data);
+        U32 mDisplayNamesUsage;
+        bool mLegacyNamesForFriends;
 };
 #endif
diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index 6878f84..7ff25a7 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -561,9 +561,13 @@ bool LLPanelGroupGeneral::apply(std::string& mesg)
                gIMMgr->saveIgnoreGroup();
        }
-        mCtrlReceiveNotices->resetDirty();      //resetDirty() here instead of in update because this is where the settings 
+        // Make sure we update the group list in our contacts list and our IMs -- MC
-    mCtrlListGroup->resetDirty();               //are actually being applied. onCommitUserOnly doesn't call updateChanged directly.
+        if (gIMMgr)
-        mCtrlReceiveChat->resetDirty();
+        {
+                // update the talk view
+                gIMMgr->refresh();
+        }
+        gAgent.fireEvent(new LLEvent(&gAgent, "new group"), "");
        mChanged = FALSE;
@@ -778,21 +782,14 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
                {
                        mCtrlReceiveNotices->setEnabled(mAllowEdit);
                }
+                mCtrlReceiveNotices->resetDirty();
        }
        if (mCtrlReceiveChat)
        {
                mCtrlReceiveChat->setVisible(is_member);
                mCtrlReceiveChat->setEnabled(TRUE);
-        }
+                mCtrlReceiveChat->resetDirty();
-        if (mCtrlListGroup)
-        {
-                mCtrlListGroup->setVisible(is_member);
-                if (is_member)
-                {
-                        mCtrlListGroup->setEnabled(mAllowEdit);
-                }
        }
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index b744961..4bfcf52 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -41,6 +41,7 @@
 #endif
 #include "llpluginclassmediaowner.h"
 #include "llviewermedia_streamingaudio.h"
+#include "kokuastreamingaudio.h"
 #include "llaudioengine.h"
 #ifdef LL_FMOD
@@ -681,19 +682,13 @@ bool idle_startup()
                                        delete gAudiop;
                                        gAudiop = NULL;
                                }
-                                if (gAudiop)
-                                {
-                                        // if the audio engine hasn't set up its own preferred handler for streaming audio then set up the generic streaming audio implementation which uses media plugins
-                                        if (NULL == gAudiop->getStreamingAudioImpl())
-                                        {
-                                                LL_INFOS("AppInit") << "Using media plugins to render streaming audio" << LL_ENDL;
-                                                gAudiop->setStreamingAudioImpl(new LLStreamingAudio_MediaPlugins());
                        }
                }
-                        }
-                }
-                
+                if (!gAudioStream)
+                        gAudioStream =  new KOKUAStreamingAudio(new LLStreamingAudio_MediaPlugins());
                LL_INFOS("AppInit") << "Audio Engine Initialized." << LL_ENDL;
                
@@ -877,7 +872,47 @@ bool idle_startup()
        if (STATE_LOGIN_CLEANUP == LLStartUp::getStartupState())
        {
                LL_DEBUGS("AppInitStartupState") << "STATE_LOGIN_CLEANUP" << LL_ENDL;
+                gDisconnected = TRUE;
+                std::string cmd_line_grid_choice = gSavedSettings.getString("CmdLineGridChoice");
+                std::string cmd_line_login_uri = gSavedSettings.getLLSD("CmdLineLoginURI").asString();
+                if(!cmd_line_grid_choice.empty() && cmd_line_login_uri.empty())
+                {
+                        gHippoGridManager->setCurrentGrid(cmd_line_grid_choice);
+                }
+                gHippoGridManager->setCurrentGridAsConnected();
+                gHippoLimits->setLimits();
+                if (gHippoGridManager->getConnectedGrid()->isSecondLife())
+                {
+                        LLStartUp::setStartupState( STATE_LECTURE_PRIVACY );
+                        LLFirstUse::Privacy();
+                }
+                else
+                {               
+                        LLStartUp::setStartupState( STATE_PRIVACY_LECTURED );
+                }
+                return FALSE;
+        }
+        if (STATE_LECTURE_PRIVACY == LLStartUp::getStartupState())
+        {
+                LL_DEBUGS("AppInitStartupState") << "STATE_LECTURE_PRIVACY" << LL_ENDL;
+                //wait for the user to decide
+                ms_sleep(1);
+                return FALSE;
+        }
+        if (STATE_PRIVACY_LECTURED == LLStartUp::getStartupState())
+        {
+                LL_DEBUGS("AppInitStartupState") << "STATE_PRIVACY_LECTURED" << LL_ENDL;
                //reset the values that could have come in from a slurl
                if (!gLoginHandler.getWebLoginKey().isNull())
                {
@@ -919,15 +954,9 @@ bool idle_startup()
                        gDebugInfo["LoginName"] = firstname + " " + lastname;   
                }
-                std::string cmd_line_grid_choice = gSavedSettings.getString("CmdLineGridChoice");
-                std::string cmd_line_login_uri = gSavedSettings.getLLSD("CmdLineLoginURI").asString();
-                if(!cmd_line_grid_choice.empty() && cmd_line_login_uri.empty())
-                {
-                        gHippoGridManager->setCurrentGrid(cmd_line_grid_choice);
-                }
-                gHippoGridManager->setCurrentGridAsConnected();
-                gHippoLimits->setLimits();
                // create necessary directories
                // *FIX: these mkdir's should error check
                gDirUtilp->setLindenUserDir(gHippoGridManager->getCurrentGridNick(), firstname, lastname);
@@ -2005,6 +2034,12 @@ bool idle_startup()
        
                        // Load stored cache if possible
            LLAppViewer::instance()->loadNameCache();
+                        // Start cache in not-running state until we figure out if we have
+                        // capabilities for display name lookup
+                        LLAvatarNameCache::initClass(false);
+                        LLAvatarNameCache::setUseDisplayNames(gSavedSettings.getU32("DisplayNamesUsage"));
+                        LLAvatarName::sOmitResidentAsLastName = (bool)gSavedSettings.getBOOL("OmitResidentAsLastName");
                }
                // *Note: this is where gWorldMap used to be initialized.
@@ -3772,6 +3807,8 @@ std::string LLStartUp::startupStateToString(EStartupState state)
                RTNENUM( STATE_LOGIN_SHOW );
                RTNENUM( STATE_LOGIN_WAIT );
                RTNENUM( STATE_LOGIN_CLEANUP );
+                RTNENUM( STATE_LECTURE_PRIVACY );
+                RTNENUM( STATE_PRIVACY_LECTURED );
                RTNENUM( STATE_LOGIN_VOICE_LICENSE );
                RTNENUM( STATE_UPDATE_CHECK );
                RTNENUM( STATE_LOGIN_AUTH_INIT );
diff --git a/linden/indra/newview/llstartup.h b/linden/indra/newview/llstartup.h
index 08862e6..3fe8daa 100644
--- a/linden/indra/newview/llstartup.h
+++ b/linden/indra/newview/llstartup.h
@@ -49,7 +49,9 @@ typedef enum {
        STATE_BROWSER_INIT,             // Initialize web browser for login screen
        STATE_LOGIN_SHOW,                               // Show login screen
        STATE_LOGIN_WAIT,                               // Wait for user input at login screen
-        STATE_LOGIN_CLEANUP,                    // Get rid of login screen and start login
+        STATE_LOGIN_CLEANUP,                    // lecture about privacy
+        STATE_LECTURE_PRIVACY,                  //   wait until the lecture was read
+        STATE_PRIVACY_LECTURED,                 // Get rid of login screen and start login
        STATE_LOGIN_VOICE_LICENSE,              // Show license agreement for using voice
        STATE_UPDATE_CHECK,                             // Wait for user at a dialog box (updates, term-of-service, etc)
        STATE_LOGIN_AUTH_INIT,                  // Start login to SL servers
diff --git a/linden/indra/newview/lltexlayer.cpp b/linden/indra/newview/lltexlayer.cpp
index c8e1298..ceef28b 100644
--- a/linden/indra/newview/lltexlayer.cpp
+++ b/linden/indra/newview/lltexlayer.cpp
@@ -213,6 +213,7 @@ BOOL LLTexLayerSetBuffer::needsRender()
        LLVOAvatar* avatar = mTexLayerSet->getAvatar();
        BOOL upload_now = needsUploadNow();
        BOOL needs_update = (mNeedsUpdate || upload_now) && !avatar->mAppearanceAnimating;
        if (needs_update)
        {
                BOOL invalid_skirt = avatar->getBakedTE(mTexLayerSet) == TEX_SKIRT_BAKED && !avatar->isWearingWearableType(WT_SKIRT);
@@ -275,16 +276,16 @@ BOOL LLTexLayerSetBuffer::render()
                        }
                        else
                        {
-                                //                              mUploadPending = FALSE;//see...
+                                //mUploadPending = FALSE;//see...
-                                //                              mNeedsUpload = FALSE;//     ...below...
+                                //mNeedsUpload = FALSE;//     ...below...
                                LLVOAvatar*     avatar = mTexLayerSet->getAvatar();
                                if (avatar)
                                {
                                        avatar->setNewBakedTexture(avatar->getBakedTE(mTexLayerSet), IMG_INVISIBLE);
                                        llinfos << "Invisible baked texture set for " << mTexLayerSet->getBodyRegion() << llendl;
                                }
-                                readBackAndUpload();    //... here: Opensim is not happy if we don't
+                                readBackAndUpload();   //... here: Opensim is not happy if we don't
-                                                        //TODO: find out if SL is happy if we do
+                                //TODO: find out if SL is happy if we do
                        }
                }
        }
@@ -350,12 +351,11 @@ void LLTexLayerSetBuffer::readBackAndUpload()
        // writes into baked_color_data
        const char* comment_text = NULL;
-        S32 baked_image_components = 5; // red green blue bump clothing
+        S32 baked_image_components =  5; // red green blue bump clothing
        LLPointer<LLImageRaw> baked_image = new LLImageRaw( mWidth, mHeight, baked_image_components );
        U8* baked_image_data = baked_image->getData();
        
        comment_text = LINDEN_J2C_COMMENT_PREFIX "RGBHM"; // 5 channels: rgb, heightfield/alpha, mask
        S32 i = 0;
        for (S32 u = 0; u < mWidth; u++)
        {
@@ -492,7 +492,7 @@ void LLTexLayerSetBuffer::onTextureUploadComplete(const LLUUID& uuid, void* user
                                avatar->setNewBakedTexture(baked_te, uuid);
                        }
                        else
-                        {       
+                        {
                                ++failures;
                                llinfos << "Baked upload failed (attempt " << failures << "/" << MAX_BAKE_UPLOAD_ATTEMPTS << "), ";
                                if (failures >= MAX_BAKE_UPLOAD_ATTEMPTS)
@@ -1412,7 +1412,7 @@ BOOL LLTexLayer::render( S32 x, S32 y, S32 width, S32 height )
                                        LLTexUnit::eTextureAddressMode old_mode = image_gl->getAddressMode();
                                        
-                                        gGL.getTexUnit(0)->bind(image_gl);
+                                        gGL.getTexUnit(0)->bind(image_gl, TRUE);
                                        gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_CLAMP);
                                        gl_rect_2d_simple_tex( width, height );
@@ -1430,7 +1430,7 @@ BOOL LLTexLayer::render( S32 x, S32 y, S32 width, S32 height )
                        LLImageGL* image_gl = gTexStaticImageList.getImageGL( getInfo()->mStaticImageFileName, getInfo()->mStaticImageIsMask );
                        if( image_gl )
                        {
-                                gGL.getTexUnit(0)->bind(image_gl);
+                                gGL.getTexUnit(0)->bind(image_gl, TRUE);
                                gl_rect_2d_simple_tex( width, height );
                                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                        }
@@ -1656,7 +1656,7 @@ BOOL LLTexLayer::renderAlphaMasks( S32 x, S32 y, S32 width, S32 height, LLColor4
                                        LLTexUnit::eTextureAddressMode old_mode = image_gl->getAddressMode();
                                        
-                                        gGL.getTexUnit(0)->bind(image_gl);
+                                        gGL.getTexUnit(0)->bind(image_gl, TRUE);
                                        gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_CLAMP);
                                        gl_rect_2d_simple_tex( width, height );
@@ -1678,7 +1678,7 @@ BOOL LLTexLayer::renderAlphaMasks( S32 x, S32 y, S32 width, S32 height, LLColor4
                                        ( (image_gl->getComponents() == 1) && getInfo()->mStaticImageIsMask ) )
                                {
                                        LLGLSNoAlphaTest gls_no_alpha_test;
-                                        gGL.getTexUnit(0)->bind(image_gl);
+                                        gGL.getTexUnit(0)->bind(image_gl, TRUE);
                                        gl_rect_2d_simple_tex( width, height );
                                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                                }
@@ -2146,7 +2146,7 @@ BOOL LLTexLayerParamAlpha::render( S32 x, S32 y, S32 width, S32 height )
                                }
                                LLGLSNoAlphaTest gls_no_alpha_test;
-                                gGL.getTexUnit(0)->bind(mCachedProcessedImageGL);
+                                gGL.getTexUnit(0)->bind(mCachedProcessedImageGL, TRUE);
                                gl_rect_2d_simple_tex( width, height );
                                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                                stop_glerror();
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index 4679137..2e7d585 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -736,9 +736,6 @@ void LLTextureCacheWorker::endWork(S32 param, bool aborted)
 LLTextureCache::LLTextureCache(bool threaded)
        : LLWorkerThread("TextureCache", threaded),
-          mWorkersMutex(NULL),
-          mHeaderMutex(NULL),
-          mListMutex(NULL),
          mHeaderAPRFile(NULL),
          mReadOnly(FALSE),
          mTexturesSizeTotal(0),
@@ -1543,7 +1540,7 @@ bool LLTextureCache::readComplete(handle_t handle, bool abort)
                }
        }
-        unlockWorkers();
+        unlockWorkers();
        if (delete_worker) worker->scheduleDelete();
diff --git a/linden/indra/newview/lltexturecache.h b/linden/indra/newview/lltexturecache.h
index c859b9a..56b4c4f 100644
--- a/linden/indra/newview/lltexturecache.h
+++ b/linden/indra/newview/lltexturecache.h
@@ -139,9 +139,6 @@ protected:
        std::string getTextureFileName(const LLUUID& id);
        void addCompleted(Responder* responder, bool success);
        
-protected:
-        //void setFileAPRPool(apr_pool_t* pool) { mFileAPRPool = pool ; }
 private:
        void setDirNames(ELLPath location);
        void readHeaderCache();
diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index f93a574..072af25 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -428,7 +428,6 @@ LLTextureFetchWorker::LLTextureFetchWorker(LLTextureFetch* fetcher,
          mRetryAttempt(0),
          mActiveCount(0),
          mGetStatus(0),
-          mWorkMutex(NULL),
          mFirstPacket(0),
          mLastPacket(-1),
          mTotalPackets(0),
@@ -1540,8 +1539,6 @@ LLTextureFetch::LLTextureFetch(LLTextureCache* cache, LLImageDecodeThread* image
          mDebugPause(FALSE),
          mPacketCount(0),
          mBadPacketCount(0),
-          mQueueMutex(getAPRPool()),
-          mNetworkQueueMutex(getAPRPool()),
          mTextureCache(cache),
          mImageDecodeThread(imagedecodethread),
          mTextureBandwidth(0),
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 296d1bb..34735a3 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -645,8 +645,6 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
        }
        */
-        
-        gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
        LLViewerObject *object = NULL;
        LLViewerObject *parent = NULL;
@@ -697,9 +695,14 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
                {
                        gViewerWindow->getWindow()->setCursor(UI_CURSOR_HAND);
                }
+                else
+                {
+                        gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
+                }
        }
        else
        {
+                gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
                // We need to clear media hover flag
                if (LLViewerMediaFocus::getInstance()->getMouseOverFlag())
                {
diff --git a/linden/indra/newview/llvieweraudio.cpp b/linden/indra/newview/llvieweraudio.cpp
index 91e7ce5..d465177 100644
--- a/linden/indra/newview/llvieweraudio.cpp
+++ b/linden/indra/newview/llvieweraudio.cpp
@@ -33,6 +33,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "llaudioengine.h"
+#include "kokuastreamingaudio.h"
 #include "llagent.h"
 #include "llappviewer.h"
 #include "llvieweraudio.h"
@@ -46,69 +47,71 @@
 void init_audio() 
 {
-        if (!gAudiop) 
+        if (gAudiop) 
        {
-                llwarns << "Failed to create an appropriate Audio Engine" << llendl;
+                LLVector3d lpos_global = gAgent.getCameraPositionGlobal();
-                return;
+                LLVector3 lpos_global_f;
+        
+                lpos_global_f.setVec(lpos_global);
+                                                
+                gAudiop->setListener(lpos_global_f,
+                                                        LLVector3::zero,        // LLViewerCamera::getInstance()->getVelocity(),    // !!! BUG need to replace this with smoothed velocity!
+                                                        LLViewerCamera::getInstance()->getUpAxis(),
+                                                        LLViewerCamera::getInstance()->getAtAxis());
+        
+        // load up our initial set of sounds we'll want so they're in memory and ready to be played
+        
+                bool mute_audio = gSavedSettings.getBOOL("MuteAudio");
+        
+                if (!mute_audio && FALSE == gSavedSettings.getBOOL("NoPreload"))
+                {
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndAlert")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndBadKeystroke")));
+                        //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndChatFromObject")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndClick")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndClickRelease")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndHealthReductionF")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndHealthReductionM")));
+                        //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndIncomingChat")));
+                        //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndIncomingIM")));
+                        //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndInvApplyToObject")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndInvalidOp")));
+                        //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndInventoryCopyToInv")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndMoneyChangeDown")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndMoneyChangeUp")));
+                        //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectCopyToInv")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectCreate")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectDelete")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectRezIn")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectRezOut")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuAppear")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuHide")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuSliceHighlight0")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuSliceHighlight1")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuSliceHighlight2")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuSliceHighlight3")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuSliceHighlight4")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuSliceHighlight5")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuSliceHighlight6")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuSliceHighlight7")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndSnapshot")));
+                        //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndStartAutopilot")));
+                        //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndStartFollowpilot")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndStartIM")));
+                        //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndStopAutopilot")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndTeleportOut")));
+                        //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndTextureApplyToObject")));
+                        //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndTextureCopyToInv")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndTyping")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndWindowClose")));
+                        gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndWindowOpen")));
+                }
        }
-        LLVector3d lpos_global = gAgent.getCameraPositionGlobal();
+        else
-        LLVector3 lpos_global_f;
-        lpos_global_f.setVec(lpos_global);
-                                        
-        gAudiop->setListener(lpos_global_f,
-                                                  LLVector3::zero,      // LLViewerCamera::getInstance()->getVelocity(),    // !!! BUG need to replace this with smoothed velocity!
-                                                  LLViewerCamera::getInstance()->getUpAxis(),
-                                                  LLViewerCamera::getInstance()->getAtAxis());
-// load up our initial set of sounds we'll want so they're in memory and ready to be played
-        bool mute_audio = gSavedSettings.getBOOL("MuteAudio");
-        if (!mute_audio && FALSE == gSavedSettings.getBOOL("NoPreload"))
        {
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndAlert")));
+                llwarns << "Failed to create an appropriate Audio Engine" << llendl;
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndBadKeystroke")));
+                return;
-                //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndChatFromObject")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndClick")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndClickRelease")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndHealthReductionF")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndHealthReductionM")));
-                //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndIncomingChat")));
-                //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndIncomingIM")));
-                //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndInvApplyToObject")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndInvalidOp")));
-                //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndInventoryCopyToInv")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndMoneyChangeDown")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndMoneyChangeUp")));
-                //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectCopyToInv")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectCreate")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectDelete")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectRezIn")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectRezOut")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuAppear")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuHide")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuSliceHighlight0")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuSliceHighlight1")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuSliceHighlight2")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuSliceHighlight3")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuSliceHighlight4")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuSliceHighlight5")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuSliceHighlight6")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuSliceHighlight7")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndSnapshot")));
-                //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndStartAutopilot")));
-                //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndStartFollowpilot")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndStartIM")));
-                //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndStopAutopilot")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndTeleportOut")));
-                //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndTextureApplyToObject")));
-                //gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndTextureCopyToInv")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndTyping")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndWindowClose")));
-                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndWindowOpen")));
        }
        audio_update_volume(true);
 }
@@ -158,12 +161,12 @@ void audio_update_volume(bool force_update)
        }
        // Streaming Music
-        if (gAudiop) 
+        if (gAudioStream) 
        {               
                F32 music_volume = gSavedSettings.getF32("AudioLevelMusic");
                BOOL music_muted = gSavedSettings.getBOOL("MuteMusic");
                music_volume = mute_volume * master_volume * (music_volume*music_volume);
-                gAudiop->setInternetStreamGain ( music_muted ? 0.f : music_volume );
+                gAudioStream->setInternetStreamGain ( music_muted ? 0.f : music_volume );
        
        }
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 3675072..572f64a 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -38,8 +38,11 @@
 #include "indra_constants.h"
 // For Listeners
-#include "llaudioengine.h"
+// #include "llaudioengine.h"
+#include "kokuastreamingaudio.h"
 #include "llagent.h"
+#include "llavatarnamecache.h"
+#include "llcallingcard.h"
 #include "llconsole.h"
 #include "lldrawpoolterrain.h"
 #include "llflexibleobject.h"
@@ -310,7 +313,7 @@ static bool handleJoystickChanged(const LLSD& newvalue)
 static bool handleAudioStreamMusicChanged(const LLSD& newvalue)
 {
-        if (gAudiop)
+        if (gAudioStream)
        {
                if ( newvalue.asBoolean() )
                {
@@ -319,15 +322,15 @@ static bool handleAudioStreamMusicChanged(const LLSD& newvalue)
                        {
                                // if stream is already playing, don't call this
                                // otherwise music will briefly stop
-                                if ( !gAudiop->isInternetStreamPlaying() )
+                                if ( !gAudioStream->isInternetStreamPlaying() )
                                {
-                                        gAudiop->startInternetStream(LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL());
+                                        gAudioStream->startInternetStream(LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL());
                                }
                        }
                }
                else
                {
-                        gAudiop->stopInternetStream();
+                        gAudioStream->stopInternetStream();
                }
        }
        return true;
@@ -425,6 +428,28 @@ static bool handleAuditTextureChanged(const LLSD& newvalue)
        return true;
 }
+static bool handleDisplayNamesUsageChanged(const LLSD& newvalue)
+{
+        LLAvatarNameCache::setUseDisplayNames((U32)newvalue.asInteger());
+        LLVOAvatar::invalidateNameTags();
+        LLAvatarTracker::instance().dirtyBuddies();
+        return true;
+}
+static bool handleOmitResidentAsLastNameChanged(const LLSD& newvalue)
+{
+        LLAvatarName::sOmitResidentAsLastName =(bool)newvalue.asBoolean();
+        LLVOAvatar::invalidateNameTags();
+        LLAvatarTracker::instance().dirtyBuddies();
+        return true;
+}
+static bool handleLegacyNamesForFriendsChanged(const LLSD& newvalue)
+{
+        LLAvatarTracker::instance().dirtyBuddies();
+        return true;
+}
 static bool handleRenderDebugGLChanged(const LLSD& newvalue)
 {
        gDebugGL = newvalue.asBoolean();
@@ -572,6 +597,9 @@ void settings_setup_listeners()
        gSavedSettings.getControl("AudioLevelRolloff")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
        gSavedSettings.getControl("AudioStreamingMusic")->getSignal()->connect(boost::bind(&handleAudioStreamMusicChanged, _1));
        gSavedSettings.getControl("AuditTexture")->getSignal()->connect(boost::bind(&handleAuditTextureChanged, _1));
+        gSavedSettings.getControl("DisplayNamesUsage")->getSignal()->connect(boost::bind(&handleDisplayNamesUsageChanged, _1));
+        gSavedSettings.getControl("OmitResidentAsLastName")->getSignal()->connect(boost::bind(&handleOmitResidentAsLastNameChanged, _1));
+        gSavedSettings.getControl("LegacyNamesForFriends")->getSignal()->connect(boost::bind(&handleLegacyNamesForFriendsChanged, _1));
        gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
        gSavedSettings.getControl("MuteMusic")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
        gSavedSettings.getControl("MuteMedia")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
diff --git a/linden/indra/newview/llviewerdisplayname.cpp b/linden/indra/newview/llviewerdisplayname.cpp
new file mode 100644
index 0000000..6a7cab3
--- /dev/null
+++ b/linden/indra/newview/llviewerdisplayname.cpp
@@ -0,0 +1,208 @@
+/** 
+ * @file llviewerdisplayname.cpp
+ * @brief Wrapper for display name functionality
+ *
+ * $LicenseInfo:firstyear=2010&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+#include "llviewerprecompiledheaders.h"
+#include "llviewerdisplayname.h"
+// viewer includes
+#include "llagent.h"
+#include "llviewerregion.h"
+#include "llvoavatar.h"
+// library includes
+#include "llavatarnamecache.h"
+#include "llhttpclient.h"
+#include "llhttpnode.h"
+#include "llnotifications.h"
+#include "llui.h"                                       // getLanguage()
+namespace LLViewerDisplayName
+{
+        // Fired when viewer receives server response to display name change
+        set_name_signal_t sSetDisplayNameSignal;
+        // Fired when there is a change in the agent's name
+        name_changed_signal_t sNameChangedSignal;
+        void addNameChangedCallback(const name_changed_signal_t::slot_type& cb) 
+        { 
+                sNameChangedSignal.connect(cb); 
+        }
+}
+class LLSetDisplayNameResponder : public LLHTTPClient::Responder
+{
+public:
+        // only care about errors
+        /*virtual*/ void error(U32 status, const std::string& reason)
+        {
+                LLViewerDisplayName::sSetDisplayNameSignal(false, "", LLSD());
+                LLViewerDisplayName::sSetDisplayNameSignal.disconnect_all_slots();
+        }
+};
+void LLViewerDisplayName::set(const std::string& display_name, const set_name_slot_t& slot)
+{
+        // TODO: simple validation here
+        LLViewerRegion* region = gAgent.getRegion();
+        llassert(region);
+        std::string cap_url = region->getCapability("SetDisplayName");
+        if (cap_url.empty())
+        {
+                // this server does not support display names, report error
+                slot(false, "unsupported", LLSD());
+                return;
+        }
+        // People API can return localized error messages.  Indicate our
+        // language preference via header.
+        LLSD headers;
+        headers["Accept-Language"] = LLUI::getLanguage();
+        // People API requires both the old and new value to change a variable.
+        // Our display name will be in cache before the viewer's UI is available
+        // to request a change, so we can use direct lookup without callback.
+        LLAvatarName av_name;
+        if (!LLAvatarNameCache::get( gAgent.getID(), &av_name))
+        {
+                slot(false, "name unavailable", LLSD());
+                return;
+        }
+        // People API expects array of [ "old value", "new value" ]
+        LLSD change_array = LLSD::emptyArray();
+        change_array.append(av_name.mDisplayName);
+        change_array.append(display_name);
+        
+        llinfos << "Set name POST to " << cap_url << llendl;
+        // Record our caller for when the server sends back a reply
+        sSetDisplayNameSignal.connect(slot);
+        
+        // POST the requested change.  The sim will not send a response back to
+        // this request directly, rather it will send a separate message after it
+        // communicates with the back-end.
+        LLSD body;
+        body["display_name"] = change_array;
+        LLHTTPClient::post(cap_url, body, new LLSetDisplayNameResponder, headers);
+}
+class LLSetDisplayNameReply : public LLHTTPNode
+{
+        LOG_CLASS(LLSetDisplayNameReply);
+public:
+        /*virtual*/ void post(
+                LLHTTPNode::ResponsePtr response,
+                const LLSD& context,
+                const LLSD& input) const
+        {
+                LLSD body = input["body"];
+                S32 status = body["status"].asInteger();
+                bool success = (status == 200);
+                std::string reason = body["reason"].asString();
+                LLSD content = body["content"];
+                llinfos << "status " << status << " reason " << reason << llendl;
+                // If viewer's concept of display name is out-of-date, the set request
+                // will fail with 409 Conflict.  If that happens, fetch up-to-date
+                // name information.
+                if (status == 409)
+                {
+                        LLUUID agent_id = gAgent.getID();
+                        // Flush stale data
+                        LLAvatarNameCache::erase( agent_id );
+                        // Queue request for new data
+                        LLAvatarName ignored;
+                        LLAvatarNameCache::get( agent_id, &ignored );
+                        // Kill name tag, as it is wrong
+                        LLVOAvatar::invalidateNameTag( agent_id );
+                }
+                // inform caller of result
+                LLViewerDisplayName::sSetDisplayNameSignal(success, reason, content);
+                LLViewerDisplayName::sSetDisplayNameSignal.disconnect_all_slots();
+        }
+};
+class LLDisplayNameUpdate : public LLHTTPNode
+{
+        /*virtual*/ void post(
+                LLHTTPNode::ResponsePtr response,
+                const LLSD& context,
+                const LLSD& input) const
+        {
+                LLSD body = input["body"];
+                LLUUID agent_id = body["agent_id"];
+                std::string old_display_name = body["old_display_name"];
+                // By convention this record is called "agent" in the People API
+                LLSD name_data = body["agent"];
+                // Inject the new name data into cache
+                LLAvatarName av_name;
+                av_name.fromLLSD( name_data );
+                llinfos << "name-update now " << LLDate::now()
+                        << " next_update " << LLDate(av_name.mNextUpdate)
+                        << llendl;
+                // Name expiration time may be provided in headers, or we may use a
+                // default value
+                // *TODO: get actual headers out of ResponsePtr
+                //LLSD headers = response->mHeaders;
+                LLSD headers;
+                av_name.mExpires = 
+                        LLAvatarNameCache::nameExpirationFromHeaders(headers);
+                LLAvatarNameCache::insert(agent_id, av_name);
+                // force name tag to update
+                LLVOAvatar::invalidateNameTag(agent_id);
+                LLSD args;
+                args["OLD_NAME"] = old_display_name;
+                args["SLID"] = av_name.mUsername;
+                args["NEW_NAME"] = av_name.mDisplayName;
+                LLNotifications::instance().add("DisplayNameUpdate", args);
+                if (agent_id == gAgent.getID())
+                {
+                        LLViewerDisplayName::sNameChangedSignal();
+                }
+        }
+};
+LLHTTPRegistration<LLSetDisplayNameReply>
+    gHTTPRegistrationMessageSetDisplayNameReply(
+                "/message/SetDisplayNameReply");
+LLHTTPRegistration<LLDisplayNameUpdate>
+    gHTTPRegistrationMessageDisplayNameUpdate(
+                "/message/DisplayNameUpdate");
diff --git a/linden/indra/newview/llviewerdisplayname.h b/linden/indra/newview/llviewerdisplayname.h
new file mode 100644
index 0000000..16d59ae
--- /dev/null
+++ b/linden/indra/newview/llviewerdisplayname.h
@@ -0,0 +1,53 @@
+/** 
+ * @file llviewerdisplayname.h
+ * @brief Wrapper for display name functionality
+ *
+ * $LicenseInfo:firstyear=2010&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+#ifndef LLVIEWERDISPLAYNAME_H
+#define LLVIEWERDISPLAYNAME_H
+#include <boost/signals2.hpp>
+class LLSD;
+class LLUUID;
+namespace LLViewerDisplayName
+{
+        typedef boost::signals2::signal<
+                void (bool success, const std::string& reason, const LLSD& content)>
+                        set_name_signal_t;
+        typedef set_name_signal_t::slot_type set_name_slot_t;
+        
+        typedef boost::signals2::signal<void (void)> name_changed_signal_t;
+        typedef name_changed_signal_t::slot_type name_changed_slot_t;
+        // Sends an update to the server to change a display name
+        // and call back when done.  May not succeed due to service
+        // unavailable or name not available.
+        void set(const std::string& display_name, const set_name_slot_t& slot); 
+        
+        void addNameChangedCallback(const name_changed_signal_t::slot_type& cb);
+}
+#endif // LLVIEWERDISPLAYNAME_H
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index 5c01b25..f0faedf 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -402,7 +402,7 @@ bool LLViewerMediaImpl::initializeMedia(const std::string& mime_type)
        {
                if(! initializePlugin(mime_type))
                {
-                        LL_WARNS("Plugin") << "plugin intialization failed for mime type: " << mime_type << LL_ENDL;
+                        LL_WARNS("PluginViewerMedia") << "plugin intialization failed for mime type: " << mime_type << LL_ENDL;
                        LLSD args;
                        args["MIME_TYPE"] = mime_type;
                        LLNotifications::instance().add("NoPlugin", args);
@@ -520,7 +520,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
                }
        }
-        LL_WARNS("Plugin") << "plugin intialization failed for mime type: " << media_type << LL_ENDL;
+        LL_WARNS("PluginViewerMedia") << "plugin intialization failed for mime type: " << media_type << LL_ENDL;
        LLSD args;
        args["MIME_TYPE"] = media_type;
        LLNotifications::instance().add("NoPlugin", args);
diff --git a/linden/indra/newview/llviewermedia_streamingaudio.cpp b/linden/indra/newview/llviewermedia_streamingaudio.cpp
index 575dbc8..6a4dd0f 100644
--- a/linden/indra/newview/llviewermedia_streamingaudio.cpp
+++ b/linden/indra/newview/llviewermedia_streamingaudio.cpp
@@ -69,8 +69,13 @@ void LLStreamingAudio_MediaPlugins::start(const std::string& url)
                llinfos << "mMediaPlugin is now " << mMediaPlugin << llendl;
        }
+        mVersion = mMediaPlugin ? mMediaPlugin->getPluginVersion() : std::string();
        if(!mMediaPlugin)
+        {
+                llinfos << "mMediaPlugin failed to initialize!" << llendl;
                return;
+        }
        
        if (!url.empty()) {
                llinfos << "Starting internet stream: " << url << llendl;
@@ -156,6 +161,11 @@ std::string LLStreamingAudio_MediaPlugins::getURL()
        return mURL;
 }
+std::string LLStreamingAudio_MediaPlugins::getVersion()
+{
+        return mVersion;
+}
 void LLStreamingAudio_MediaPlugins::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
 {
        if (event == MEDIA_EVENT_NAME_CHANGED)
diff --git a/linden/indra/newview/llviewermedia_streamingaudio.h b/linden/indra/newview/llviewermedia_streamingaudio.h
index 816e213..5802a31 100644
--- a/linden/indra/newview/llviewermedia_streamingaudio.h
+++ b/linden/indra/newview/llviewermedia_streamingaudio.h
@@ -56,6 +56,7 @@ class LLStreamingAudio_MediaPlugins :
        /*virtual*/ void setGain(F32 vol);
        /*virtual*/ F32 getGain();
        /*virtual*/ std::string getURL();
+        /*virtual*/ std::string getVersion();
        // inherited from LLPluginClassMediaOwner
        /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
@@ -66,6 +67,7 @@ private:
        LLPluginClassMedia *mMediaPlugin;
        std::string mURL;
        F32 mGain;
+        std::string mVersion;
 };
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 7f00382..777a871 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -41,6 +41,7 @@
 // linden library includes
 #include "llaudioengine.h"
+#include "llavatarnamecache.h"
 #include "indra_constants.h"
 #include "llassetstorage.h"
 #include "llchat.h"
@@ -102,6 +103,7 @@
 #include "llfloatercustomize.h"
 #include "llfloaterdaycycle.h"
 #include "llfloaterdirectory.h"
+#include "llfloaterdisplayname.h"
 #include "llfloatereditui.h"
 #include "llfloaterchatterbox.h"
 #include "llfloaterfriends.h"
@@ -3434,6 +3436,16 @@ class LLEditEnableCustomizeAvatar : public view_listener_t
        }
 };
+class LLEditEnableDisplayName : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = (LLAvatarNameCache::useDisplayNames() != 0);
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+                return true;
+        }
+};
 // only works on pie menu
 bool handle_sit_or_stand()
 {
@@ -5959,6 +5971,10 @@ class LLShowFloater : public view_listener_t
                {
                        LLToolBar::toggle(NULL);
                }
+                else if (floater_name == "displayname")
+                {
+                        LLFloaterDisplayName::show();
+                }
                else if (floater_name == "chat history")
                {
                        LLFloaterChat::toggleInstance(LLSD());
@@ -10666,6 +10682,20 @@ class LLAdvancedDumpAvatarLocalTextures : public view_listener_t
        }
 };
+///////////////////////////////////
+// Reload Avatar Cloud Particles //
+///////////////////////////////////
+class LLAdvancedReloadAvatarCloudParticle : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLVOAvatar::initCloud();
+                return true;
+        }
+};
 ///////////
 // Crash //
 ///////////
@@ -11118,6 +11148,7 @@ void initialize_menus()
        addMenu(new LLEditEnableDuplicate(), "Edit.EnableDuplicate");
        addMenu(new LLEditEnableTakeOff(), "Edit.EnableTakeOff");
        addMenu(new LLEditEnableCustomizeAvatar(), "Edit.EnableCustomizeAvatar");
+        addMenu(new LLEditEnableDisplayName(), "Edit.EnableDisplayName");
        addMenu(new LLAdvancedRebakeTextures(), "Advanced.RebakeTextures");
        // View menu
@@ -11453,6 +11484,7 @@ void initialize_menus()
        addMenu(new LLAdvancedDumpAttachments(), "Advanced.DumpAttachments");
        addMenu(new LLAdvancedDebugAvatarTextures(), "Advanced.DebugAvatarTextures");
        addMenu(new LLAdvancedDumpAvatarLocalTextures(), "Advanced.DumpAvatarLocalTextures");
+        addMenu(new LLAdvancedReloadAvatarCloudParticle(), "Advanced.ReloadAvatarCloudParticle");
        // Advanced > Crash
        addMenu(new LLAdvancedCrash(), "Advanced.Crash");
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 5f333e9..9ebfd04 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -2998,6 +2998,33 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
        if (is_audible)
        {
+                if (chatter && chatter->isAvatar())
+                {
+#ifdef LL_RRINTERFACE_H //MK
+                        if (!gRRenabled || !gAgent.mRRInterface.mContainsShownames)
+                        {
+#endif //mk
+                                if (LLAvatarNameCache::useDisplayNames())
+                                {
+                                        LLAvatarName avatar_name;
+                                        if (LLAvatarNameCache::get(from_id, &avatar_name))
+                                        {
+                                                if (LLAvatarNameCache::useDisplayNames() == 1)
+                                                {
+                                                        from_name = avatar_name.mDisplayName;
+                                                }
+                                                else
+                                                {
+                                                        from_name = avatar_name.getNames();
+                                                }
+                                        }
+                                        chat.mFromName = from_name;
+                                }
+#ifdef LL_RRINTERFACE_H //MK
+                        }
+#endif //mk
+                }
                BOOL visible_in_chat_bubble = FALSE;
                std::string verb;
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index a2be26a..65c1d11 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -4206,7 +4206,7 @@ void LLViewerObject::setParticleSource(const LLPartSysData& particle_parameters,
                        LLViewerImage* image;
                        if (mPartSourcep->mPartSysData.mPartImageID == LLUUID::null)
                        {
-                                image = gImageList.getImageFromFile("pixiesmall.tga");
+                                image = gImageList.getImageFromFile("pixiesmall.j2c");
                        }
                        else
                        {
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index b589f2e..630da54 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -35,7 +35,7 @@
 #include "llviewerparcelmgr.h"
 // Library includes
-#include "llaudioengine.h"
+#include "kokuastreamingaudio.h"
 #include "indra_constants.h"
 #include "llcachename.h"
 #include "llgl.h"
@@ -1672,7 +1672,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
        else
        {
                // look for music.
-                if (gAudiop)
+                if (gAudioStream)
                {
                        if (parcel)
                        {
@@ -1685,12 +1685,12 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
                                // On entering a new parcel, stop the last stream if the
                                // new parcel has a different music url.  (Empty URL counts
                                // as different.)
-                                const std::string& stream_url = gAudiop->getInternetStreamURL();
+                                const std::string& stream_url = gAudioStream->getInternetStreamURL();
                                if (music_url.empty() || music_url != stream_url)
                                {
                                        // URL is different from one currently playing.
-                                        gAudiop->stopInternetStream();
+                                        gAudioStream->stopInternetStream();
                                        // If there is a new music URL and it's valid, play it.
                                        if (music_url.size() > 12)
@@ -1700,19 +1700,19 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
                                                        optionally_start_music(music_url);
                                                }
                                        }
-                                        else if (!gAudiop->getInternetStreamURL().empty())
+                                        else if (!gAudioStream->getInternetStreamURL().empty())
                                        {
                                                llinfos << "Stopping parcel music" << llendl;
-                                                gAudiop->startInternetStream(LLStringUtil::null);
+                                                gAudioStream->startInternetStream(LLStringUtil::null);
                                        }
                                }
                        }
                        else
                        {
                                // Public land has no music
-                                gAudiop->stopInternetStream();
+                                gAudioStream->stopInternetStream();
                        }
-                }//if gAudiop
+                }//if gAudioStream
                // now check for video
                LLViewerParcelMedia::update( parcel );
@@ -1730,7 +1730,7 @@ void optionally_start_music(const std::string& music_url)
                // changed as part of SL-4878
                if ( gOverlayBar && gOverlayBar->musicPlaying())
                {
-                        gAudiop->startInternetStream(music_url);
+                        gAudioStream->startInternetStream(music_url);
                }
        }
 }
diff --git a/linden/indra/newview/llviewerprecompiledheaders.h b/linden/indra/newview/llviewerprecompiledheaders.h
index 9bc6574..a0b99bf 100644
--- a/linden/indra/newview/llviewerprecompiledheaders.h
+++ b/linden/indra/newview/llviewerprecompiledheaders.h
@@ -165,7 +165,7 @@
 #include "llinstantmessage.h"
 #include "llinvite.h"
 //#include "llloginflags.h"
-#include "llmail.h"
+//#include "llmail.h"
 #include "llmessagethrottle.h"
 #include "llnamevalue.h"
 #include "llpacketack.h"
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index d93c425..a8047b8 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -127,6 +127,8 @@ public:
                        }
                }
                
+                mRegion->setCapabilitiesReceived(true);
                if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
                {
                        LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED );
@@ -172,7 +174,8 @@ LLViewerRegion::LLViewerRegion(const U64 &handle,
        mCacheEntriesCount(0),
        mCacheID(),
        mEventPoll(NULL),
-        mReleaseNotesRequested(FALSE)
+        mReleaseNotesRequested(FALSE),
+        mCapabilitiesReceived(false)
 {
        mWidth = region_width_meters;
        mOriginGlobal = from_region_handle(handle); 
@@ -1431,6 +1434,8 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
        capabilityNames.append("FetchInventory");
        capabilityNames.append("FetchLib");
        capabilityNames.append("FetchLibDescendents");
+        capabilityNames.append("GetDisplayNames");
+        capabilityNames.append("SetDisplayName");
        capabilityNames.append("GetTexture");
        capabilityNames.append("GroupProposalBallot");
        capabilityNames.append("HomeLocation");
@@ -1509,6 +1514,16 @@ std::string LLViewerRegion::getCapability(const std::string& name) const
        return iter->second;
 }
+bool LLViewerRegion::capabilitiesReceived() const
+{
+        return mCapabilitiesReceived;
+}
+void LLViewerRegion::setCapabilitiesReceived(bool received)
+{
+        mCapabilitiesReceived = received;
+}
 void LLViewerRegion::logActiveCapabilities() const
 {
        int count = 0;
diff --git a/linden/indra/newview/llviewerregion.h b/linden/indra/newview/llviewerregion.h
index 8cc80e3..5ce8b2e 100644
--- a/linden/indra/newview/llviewerregion.h
+++ b/linden/indra/newview/llviewerregion.h
@@ -229,6 +229,11 @@ public:
        void setSeedCapability(const std::string& url);
        void setCapability(const std::string& name, const std::string& url);
        std::string getCapability(const std::string& name) const;
+        // has region received its final (not seed) capability list?
+        bool capabilitiesReceived() const;
+        void setCapabilitiesReceived(bool received);
        static bool isSpecialCapabilityName(const std::string &name);
        void logActiveCapabilities() const;
@@ -399,6 +404,7 @@ private:
 private:
        bool    mAlive;                                 // can become false if circuit disconnects
+        bool    mCapabilitiesReceived;
        //spatial partitions for objects in this region
        std::vector<LLSpatialPartition*> mObjectPartition;
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 6904bb2..27a848f 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -38,6 +38,7 @@
 #include <ctype.h>
 #include "llaudioengine.h"
+#include "llavatarnamecache.h"
 #include "noise.h"
 #include "llagent.h" //  Get state values from here
@@ -748,6 +749,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
        mAppearanceAnimating(FALSE),
        mNameString(),
        mTitle(),
+        mCompleteName(),
        mNameAway(FALSE),
        mNameBusy(FALSE),
        mNameMute(FALSE),
@@ -1474,6 +1476,7 @@ void LLVOAvatar::initClass()
        {
                loadClientTags();
        }
+        initCloud();
 }
@@ -1489,6 +1492,21 @@ void LLVOAvatar::cleanupClass()
        sXMLTree.cleanup();
 }
+LLPartSysData LLVOAvatar::sCloud;
+void LLVOAvatar::initCloud()
+{
+        // fancy particle cloud designed by Brent
+        std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "cloud.xml");
+        LLSD cloud;
+        llifstream in_file(filename);
+        LLSDSerialize::fromXMLDocument(cloud, in_file);
+        sCloud.fromLLSD(cloud);
+        LLViewerImage* cloud_image = gImageList.getImageFromFile("cloud-particle.j2c");
+        sCloud.mPartImageID                 = cloud_image->getID();
+}
 const LLVector3 LLVOAvatar::getRenderPosition() const
 {
        if (mDrawable.isNull() || mDrawable->getGeneration() < 0)
@@ -2872,7 +2890,7 @@ void LLVOAvatar::idleUpdateAppearanceAnimation()
                                 param;
                                 param = getNextVisualParam())
                        {
-                                if (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE)
+                                if (param->isTweakable())
                                {
                                        param->stopAnimating(mAppearanceAnimSetByUser);
                                }
@@ -2904,7 +2922,7 @@ void LLVOAvatar::idleUpdateAppearanceAnimation()
                                 param;
                                 param = getNextVisualParam())
                        {
-                                if (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE)
+                                if (param->isTweakable())
                                {
                                        // so boobs don't go spastic when a shape's changed, but still seems buggy
                                        //if(param->getID() != 507)
@@ -3070,34 +3088,7 @@ void LLVOAvatar::idleUpdateLoadingEffect()
                }
                else
                {
-                        LLPartSysData particle_parameters;
+                        setParticleSource(sCloud, getID());
-                        // fancy particle cloud designed by Brent
-                        particle_parameters.mPartData.mMaxAge            = 4.f;
-                        particle_parameters.mPartData.mStartScale.mV[VX] = 0.8f;
-                        particle_parameters.mPartData.mStartScale.mV[VX] = 0.8f;
-                        particle_parameters.mPartData.mStartScale.mV[VY] = 1.0f;
-                        particle_parameters.mPartData.mEndScale.mV[VX]   = 0.02f;
-                        particle_parameters.mPartData.mEndScale.mV[VY]   = 0.02f;
-                        particle_parameters.mPartData.mStartColor        = LLColor4(1, 1, 1, 0.5f);
-                        particle_parameters.mPartData.mEndColor          = LLColor4(1, 1, 1, 0.0f);
-                        particle_parameters.mPartData.mStartScale.mV[VX] = 0.8f;
-                        LLViewerImage* cloud = gImageList.getImageFromFile("cloud-particle.j2c");
-                        particle_parameters.mPartImageID                 = cloud->getID();
-                        particle_parameters.mMaxAge                      = 0.f;
-                        particle_parameters.mPattern                     = LLPartSysData::LL_PART_SRC_PATTERN_ANGLE_CONE;
-                        particle_parameters.mInnerAngle                  = 3.14159f;
-                        particle_parameters.mOuterAngle                  = 0.f;
-                        particle_parameters.mBurstRate                   = 0.02f;
-                        particle_parameters.mBurstRadius                 = 0.0f;
-                        particle_parameters.mBurstPartCount              = 1;
-                        particle_parameters.mBurstSpeedMin               = 0.1f;
-                        particle_parameters.mBurstSpeedMax               = 1.f;
-                        particle_parameters.mPartData.mFlags             = ( LLPartData::LL_PART_INTERP_COLOR_MASK | LLPartData::LL_PART_INTERP_SCALE_MASK |
-                                                                                                                                 LLPartData::LL_PART_EMISSIVE_MASK | // LLPartData::LL_PART_FOLLOW_SRC_MASK |
-                                                                                                                                 LLPartData::LL_PART_TARGET_POS_MASK );
-                        setParticleSource(particle_parameters, getID());
                }
        }
 }
@@ -3620,6 +3611,35 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                if (mNameText.notNull() && firstname && lastname)
                {
+                        std::string complete_name = firstname->getString();
+                        if (sRenderGroupTitles)
+                        {
+                                complete_name += " ";
+                        }
+                        else
+                        {
+                                // If all group titles are turned off, stack first name
+                                // on a line above last name
+                                complete_name += "\n";
+                        }
+                        complete_name += lastname->getString();
+                        if (LLAvatarNameCache::useDisplayNames())
+                        {
+                                LLAvatarName avatar_name;
+                                if (LLAvatarNameCache::get(getID(), &avatar_name))
+                                {
+                                        if (LLAvatarNameCache::useDisplayNames() == 1)
+                                        {
+                                                complete_name = avatar_name.mDisplayName;
+                                        }
+                                        else
+                                        {
+                                                complete_name = avatar_name.getNames(true);
+                                        }
+                                }
+                        }
                        BOOL is_away = mSignaledAnimations.find(ANIM_AGENT_AWAY)  != mSignaledAnimations.end();
                        BOOL is_busy = mSignaledAnimations.find(ANIM_AGENT_BUSY) != mSignaledAnimations.end();
                        BOOL is_appearance = mSignaledAnimations.find(ANIM_AGENT_CUSTOMIZE) != mSignaledAnimations.end();
@@ -3634,7 +3654,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                        }
                        if (mNameString.empty() ||
-                                new_name ||
+                                new_name || complete_name != mCompleteName ||
                                (!title && !mTitle.empty()) ||
                                (title && mTitle != title->getString()) ||
                                (is_away != mNameAway || is_busy != mNameBusy || is_muted != mNameMute)
@@ -3650,20 +3670,19 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                                line += title->getString();
                                                //LLStringFn::replace_ascii_controlchars(line,LL_UNKNOWN_CHAR); IMP-136 -- McCabe
                                                line += "\n";
-                                                line += firstname->getString();
+                                                line += complete_name;
                                        }
                                        else
                                        {
-                                                line += firstname->getString();
+                                                line += complete_name;
                                        }
-                                        line += " ";
-                                        line += lastname->getString();
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.0b
                                }
                                else
                                {
-                                        line = RlvStrings::getAnonym(line.assign(firstname->getString()).append(" ").append(lastname->getString()));
+                                        line = RlvStrings::getAnonym(complete_name);
                                }
 // [/RLVa:KB]
@@ -3673,7 +3692,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                bool show_client = client.length() != 0 && (*sShowClientNameTag);
                                if (is_away || is_muted || is_busy || show_client)
                                {
-                                        line += " (";
+                                        line += "\n(";
                                        if (is_away)
                                        {
                                                line += "Away";
@@ -3718,6 +3737,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                mNameMute = is_muted;
                                mNameAppearance = is_appearance;
                                mTitle = title ? title->getString() : "";
+                                mCompleteName = complete_name;
                                //LLStringFn::replace_ascii_controlchars(mTitle,LL_UNKNOWN_CHAR); IMP-136 -- McCabe
                                mNameString = utf8str_to_wstring(line);
                                new_name = TRUE;
@@ -3834,6 +3854,41 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
        }
 }
+void LLVOAvatar::clearNameTag()
+{
+        mNameString.clear();
+        if (mNameText)
+        {
+                mNameText->setLabel("");
+                mNameText->setString(mNameString);
+        }
+}
+//static
+void LLVOAvatar::invalidateNameTag(const LLUUID& agent_id)
+{
+        LLViewerObject* obj = gObjectList.findObject(agent_id);
+        if (!obj) return;
+        LLVOAvatar* avatar = dynamic_cast<LLVOAvatar*>(obj);
+        if (!avatar) return;
+        avatar->clearNameTag();
+}
+//static
+void LLVOAvatar::invalidateNameTags()
+{
+        std::vector<LLCharacter*>::iterator it;
+        for (it = LLCharacter::sInstances.begin(); it != LLCharacter::sInstances.end(); ++it)
+        {
+                LLVOAvatar* avatar = dynamic_cast<LLVOAvatar*>(*it);
+                if (!avatar) continue;
+                if (avatar->isDead()) continue;
+                avatar->clearNameTag();
+        }
+}
 void LLVOAvatar::idleUpdateTractorBeam()
 {
@@ -4820,6 +4875,7 @@ U32 LLVOAvatar::renderSkinned(EAvatarRenderPass pass)
                                                                            && !LLDrawPoolAlpha::sShowDebugAlpha // Don't alpha mask if "Highlight Transparent" checked
                                                                                && !LLDrawPoolAvatar::sSkipTransparent;
                LLGLState test(GL_ALPHA_TEST, should_alpha_mask);
                if (should_alpha_mask)
@@ -4935,7 +4991,6 @@ U32 LLVOAvatar::renderRigid()
                                                                    && !LLDrawPoolAlpha::sShowDebugAlpha // Don't alpha mask if "Highlight Transparent" checked
                                                                        && !LLDrawPoolAvatar::sSkipTransparent;
        LLGLState test(GL_ALPHA_TEST, should_alpha_mask);
        if (should_alpha_mask)
@@ -5918,6 +5973,7 @@ BOOL LLVOAvatar::loadAvatar()
        if (sAvatarXmlInfo->mLayerInfoList.empty())
        {
                llwarns << "avatar file: missing <layer_set> node" << llendl;
+                return FALSE;
        }
        else
        {
@@ -5958,23 +6014,22 @@ BOOL LLVOAvatar::loadAvatar()
        }
        // avatar_lad.xml : <driver_parameters>
+        LLVOAvatarXmlInfo::driver_info_list_t::iterator iter;
+        for (iter = sAvatarXmlInfo->mDriverInfoList.begin();
+                 iter != sAvatarXmlInfo->mDriverInfoList.end(); iter++)
        {
-                LLVOAvatarXmlInfo::driver_info_list_t::iterator iter;
+                LLDriverParamInfo *info = *iter;
-                for (iter = sAvatarXmlInfo->mDriverInfoList.begin();
+                LLDriverParam* driver_param = new LLDriverParam( this );
-                         iter != sAvatarXmlInfo->mDriverInfoList.end(); iter++)
+                if (driver_param->setInfo(info))
                {
-                        LLDriverParamInfo *info = *iter;
+                        addVisualParam( driver_param );
-                        LLDriverParam* driver_param = new LLDriverParam( this );
+                }
-                        if (driver_param->setInfo(info))
+                else
-                        {
+                {
-                                addVisualParam( driver_param );
+                        delete driver_param;
-                        }
+                        llwarns << "avatar file: driver_param->parseData() failed" << llendl;
-                        else
+                        return FALSE;
-                        {
-                                delete driver_param;
-                                llwarns << "avatar file: driver_param->parseData() failed" << llendl;
-                                return FALSE;
-                        }
                }
        }
@@ -8147,6 +8202,14 @@ BOOL LLVOAvatar::teToColorParams( ETextureIndex te, const char* param_name[3] )
                param_name[2] = "skirt_blue";
                break;
+        case TEX_HEAD_TATTOO:
+        case TEX_LOWER_TATTOO:
+        case TEX_UPPER_TATTOO:
+                param_name[0] = "tattoo_red";
+                param_name[1] = "tattoo_green";
+                param_name[2] = "tattoo_blue";
+                break;  
        default:
                llassert(0);
                return FALSE;
@@ -8606,7 +8669,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
                {
                        for( S32 i = 0; i < num_blocks; i++ )
                        {
-                                while( param && (param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE) )
+                                while( param && (!param->isTweakable()) )
                                {
                                        param = getNextVisualParam();
                                }
@@ -8614,7 +8677,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
                                if( !param )
                                {
                                        llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file." << llendl;
-                                        return;
+                                        break;
                                }
                                U8 value;
@@ -8655,14 +8718,10 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
                        }
                }
-                while( param && (param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE) )
+                S32 expected_tweakable_count = getVisualParamCountInGroup(VISUAL_PARAM_GROUP_TWEAKABLE); // don't worry about VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT
+                if (num_blocks != expected_tweakable_count)
                {
-                        param = getNextVisualParam();
+                        llinfos << "Number of params in AvatarAppearance msg (" << num_blocks << ") does not match number of tweakable params in avatar xml file (" << expected_tweakable_count << "). Processing what we can. Object: " << getID() << llendl;
-                }
-                if( param )
-                {
-                        llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file." << llendl;
-                        return;
                }
                if (params_changed)
@@ -8933,8 +8992,7 @@ void LLVOAvatar::dumpArchetypeXML( void* )
                for( LLVisualParam* param = avatar->getFirstVisualParam(); param; param = avatar->getNextVisualParam() )
                {
                        LLViewerVisualParam* viewer_param = (LLViewerVisualParam*)param;
-                        if( (viewer_param->getWearableType() == type) &&
+                        if (viewer_param->getWearableType() == type && viewer_param->isTweakable())
-                                (viewer_param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE) )
                        {
                                apr_file_printf( file, "\t\t<param id=\"%d\" name=\"%s\" value=\"%.3f\"/>\n",
                                                 viewer_param->getID(), viewer_param->getName().c_str(), viewer_param->getWeight() );
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index 548818d..e585a6a 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -97,6 +97,7 @@ public:
        static void initClass(); // Initialize data that's only init'd once per class.
        static void cleanupClass();     // Cleanup data that's only init'd once per class.
        static BOOL parseSkeletonFile(const std::string& filename);
+        static void initCloud();
        virtual U32 processUpdateMessage(LLMessageSystem *mesgsys,
                                                                         void **user_data,
                                                                         U32 block_num,
@@ -111,6 +112,10 @@ public:
        void idleUpdateWindEffect();
        void idleUpdateBoobEffect();
        void idleUpdateNameTag(const LLVector3& root_pos_last);
+        void clearNameTag();
+        static void invalidateNameTag(const LLUUID& agent_id);
+        // force all name tags to rebuild, useful when display names turned on/off
+        static void invalidateNameTags();
        void idleUpdateRenderCost();
        void idleUpdateTractorBeam();
        void idleUpdateBelowWater();
@@ -582,6 +587,7 @@ public:
        static F32              sLODFactor; // user-settable LOD factor
        static BOOL             sJointDebug; // output total number of joints being touched for each avatar
        static BOOL     sDebugAvatarRotation;
+        static LLPartSysData sCloud;
        static S32 sNumVisibleAvatars; // Number of instances of this class
        
@@ -675,6 +681,7 @@ protected:
        LLWString mNameString;
        std::string  mTitle;
+        std::string  mCompleteName;
        BOOL      mNameAway;
        BOOL      mNameBusy;
        BOOL      mNameMute;
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index d67b9e3..7b1ed95 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -1795,7 +1795,7 @@ void LLVoiceClient::stateMachine()
                                if(!mSocket)
                                {
-                                        mSocket = LLSocket::create(gAPRPoolp, LLSocket::STREAM_TCP);    
+                                        mSocket = LLSocket::create(LLSocket::STREAM_TCP);
                                }
                                
                                mConnected = mSocket->blockingConnect(mDaemonHost);
diff --git a/linden/indra/newview/llwatchdog.cpp b/linden/indra/newview/llwatchdog.cpp
index 330bc8a..9af050c 100644
--- a/linden/indra/newview/llwatchdog.cpp
+++ b/linden/indra/newview/llwatchdog.cpp
@@ -184,8 +184,8 @@ void LLWatchdog::init(killer_event_callback func)
        mKillerCallback = func;
        if(!mSuspectsAccessMutex && !mTimer)
        {
-                mSuspectsAccessMutex = new LLMutex(NULL);
+                mSuspectsAccessMutex = new LLMutex;
-                mTimer = new LLWatchdogTimerThread();
+                mTimer = new LLWatchdogTimerThread;
                mTimer->setSleepTime(WATCHDOG_SLEEP_TIME_USEC / 1000);
                mLastClockCount = LLTimer::getTotalTime();
diff --git a/linden/indra/newview/llwearable.cpp b/linden/indra/newview/llwearable.cpp
index b74ef02..f8123bb 100644
--- a/linden/indra/newview/llwearable.cpp
+++ b/linden/indra/newview/llwearable.cpp
@@ -535,7 +535,7 @@ BOOL LLWearable::isOldVersion()
                param;
                param = (LLViewerVisualParam*) avatar->getNextVisualParam() )
        {
-                if( (param->getWearableType() == mType) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) )
+                if (param->getWearableType() == mType && param->isTweakable())
                {
                        param_count++;
                        if( !is_in_map(mVisualParamMap, param->getID() ) )
@@ -591,7 +591,7 @@ BOOL LLWearable::isDirty()
                param;
                param = (LLViewerVisualParam*) avatar->getNextVisualParam() )
        {
-                if( (param->getWearableType() == mType) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) )
+                if (param->getWearableType() == mType && param->isTweakable())
                {
                        F32 weight = get_if_there(mVisualParamMap, param->getID(), param->getDefaultWeight());
                        weight = llclamp( weight, param->getMinWeight(), param->getMaxWeight() );
@@ -690,7 +690,7 @@ void LLWearable::setParamsToDefaults()
        mVisualParamMap.clear();
        for( LLVisualParam* param = avatar->getFirstVisualParam(); param; param = avatar->getNextVisualParam() )
        {
-                if( (((LLViewerVisualParam*)param)->getWearableType() == mType ) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) )
+                if (((LLViewerVisualParam*)param)->getWearableType() == mType && param->isTweakable())
                {
                        mVisualParamMap[param->getID()] = param->getDefaultWeight();
                }
@@ -724,7 +724,7 @@ void LLWearable::writeToAvatar( BOOL set_by_user )
        // Pull params
        for( LLVisualParam* param = avatar->getFirstVisualParam(); param; param = avatar->getNextVisualParam() )
        {
-                if( (((LLViewerVisualParam*)param)->getWearableType() == mType) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) )
+                if (((LLViewerVisualParam*)param)->getWearableType() == mType && param->isTweakable())
                {
                        S32 param_id = param->getID();
                        F32 weight = get_if_there(mVisualParamMap, param_id, param->getDefaultWeight());
@@ -825,7 +825,7 @@ void LLWearable::removeFromAvatar( EWearableType type, BOOL set_by_user )
        // Pull params
        for( LLVisualParam* param = avatar->getFirstVisualParam(); param; param = avatar->getNextVisualParam() )
        {
-                if( (((LLViewerVisualParam*)param)->getWearableType() == type) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) )
+                if (((LLViewerVisualParam*)param)->getWearableType() == type && param->isTweakable())
                {
                        S32 param_id = param->getID();
                        avatar->setVisualParamWeight( param_id, param->getDefaultWeight(), set_by_user );
@@ -873,7 +873,7 @@ void LLWearable::readFromAvatar()
        mVisualParamMap.clear();
        for( LLVisualParam* param = avatar->getFirstVisualParam(); param; param = avatar->getNextVisualParam() )
        {
-                if( (((LLViewerVisualParam*)param)->getWearableType() == mType) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) )
+                if (((LLViewerVisualParam*)param)->getWearableType() == mType && param->isTweakable())
                {
                        
                        //pretty sure is right
@@ -938,7 +938,7 @@ void LLWearable::copyDataFrom( LLWearable* src )
                param;
                param = (LLViewerVisualParam*) avatar->getNextVisualParam() )
        {
-                if( (param->getWearableType() == mType) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) )
+                if (param->getWearableType() == mType && param->isTweakable())
                {
                        S32 id = param->getID();
                        F32 weight = get_if_there(src->mVisualParamMap, id, param->getDefaultWeight() );
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
index a0dd938..d5b61a7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
@@ -1172,11 +1172,15 @@ scratch and wear it.
            <texture_picker name="Lower Tattoo" label="Lower Tattoo" tool_tip="Click to choose a picture"
             can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
             follows="left|top" width="70" height="80" left="14" bottom="-325"/>
+                        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-415"
+                             can_apply_immediately="true" color="1 1 1 1" follows="left|top" height="80"
+                             label="Color/Tint" left="14" mouse_opaque="true" name="Color/Tint"
+                             tool_tip="Click to open Color Picker" width="70" />
                        <button name="Create New" label="Create New Tattoo" label_selected="Create New Tattoo"
                 follows="left|top" halign="center" width="170" height="24" left="8" bottom="-128"
                             mouse_opaque="true" scale_image="true"/>
            <button name="Take Off" label="Take Off" label_selected="Take Off"
-             follows="left|top" width="82" height="20" left="8" bottom="-365"/>
+             follows="left|top" width="82" height="20" left="8" bottom="-440"/>
            <button name="Save" label="Save" label_selected="Save"
             follows="right|bottom" width="82" height="20" left="123" bottom="-478"/>
            <button name="Save As" label="Save As..." label_selected="Save As..."
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_display_name.xml b/linden/indra/newview/skins/default/xui/en-us/floater_display_name.xml
new file mode 100644
index 0000000..5875efb
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_display_name.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Display Name" title="CHANGE DISPLAY NAME"
+ can_minimize="true" can_close="true" can_resize="false"
+ enabled="true" mouse_opaque="true" 
+ height="235" width="440">
+        <text name="info_text1" font="SansSerif" wrap="true"
+         height="18" width="380" left="42" bottom_delta="-48" follows="left|top">
+                The name you give to your avatar is called your Display Name.
+        </text>
+        <text name="info_text2" font="SansSerif" wrap="true"
+         height="18" width="300" left="120" bottom_delta="-18" follows="left|top">
+                You can change it once a week.
+        </text>
+        <text name="now_ok_text" font="SansSerif"
+         height="18" width="320" left="105" bottom_delta="-25" follows="left|top">
+                You can change it now if you so wish.
+        </text>
+        <text name="lockout_text" font="SansSerif" visible="false"
+         height="18" width="380" left="20" bottom_delta="0" follows="left|top">
+                You cannot change it before: [TIME].
+        </text>
+        <text name="set_name_label" font="SansSerif"
+         height="20" width="380" left="20" bottom_delta="-25" follows="left|top">
+                New Display Name:
+        </text>
+        <line_editor name="display_name_editor" max_length="31"
+         height="20" width="360" left="40" bottom_delta="-20" follows="left|top" />
+        <text name="name_confirm_label" font="SansSerif"
+         height="20" width="380" left="20" bottom_delta="-32" follows="left|top">
+                Type your new name again to confirm:
+        </text>
+        <line_editor name="display_name_confirm" max_length="31"
+         height="20" width="360" left="40" bottom_delta="-20" follows="left|top" />
+    <button name="save_btn" label="Save" font="SansSerif"
+         tool_tip="Save your new Display Name"
+     height="20" width="120" left="30" bottom_delta="-32"/>
+    <button name="reset_btn" label="Reset" font="SansSerif"
+         tool_tip="Make Display Name the same as Username"
+     height="20" width="120" left_delta="130" bottom_delta="0"/>
+    <button name="cancel_btn" label="Cancel" font="SansSerif"
+     height="20" width="120" left_delta="130" bottom_delta="0"/>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_new_im.xml b/linden/indra/newview/skins/default/xui/en-us/floater_new_im.xml
index c93b890..5d766be 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_new_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_new_im.xml
@@ -8,7 +8,7 @@
             column_padding="5" draw_border="true" draw_heading="false"
             draw_stripes="true" enabled="true" follows="left|top|right|bottom"
             height="290" left="6" mouse_opaque="true" multi_select="false"
-             name="user_list" width="421" />
+             name="user_list" use_display_names="true" width="421" />
        <button bottom="-271" enabled="true" follows="right|bottom" font="SansSerif"
             halign="center" height="20" label="Start" label_selected="Start" left="435"
             mouse_opaque="true" name="start_btn" scale_image="true" sound_flags="0"
@@ -17,9 +17,6 @@
             halign="center" height="20" label="Close" label_selected="Close" left="435"
             mouse_opaque="true" name="close_btn" scale_image="true" sound_flags="0"
             width="60" />
-        <string name="name_format">
-                [FIRST] [LAST]
-        </string>
        <string name="online_descriptor">
                (online)
        </string>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
index 81dd05a..69e62f8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
@@ -21,7 +21,7 @@
        <check_box bottom="-276" enabled="true" follows="left|top" font="SansSerifSmall"
             height="16" initial_value="false" label="Eyes" left="13"
             mouse_opaque="true" name="checkbox_Eyes" radio_style="false" width="100" />
-        <check_box bottom="-456" enabled="true" follows="left|top" font="SansSerifSmall"
+        <check_box bottom="-434" enabled="true" follows="left|top" font="SansSerifSmall"
             height="16" initial_value="false" label="Rename Clothing To Folder Name"
             left="13" mouse_opaque="true" name="rename" radio_style="false" width="210" />
        <check_box bottom="-216" enabled="true" follows="left|top" font="SansSerifSmall"
@@ -256,7 +256,7 @@ now wearing into it.
                Attachments:
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-436" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-414" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
             mouse_opaque="true" name="Options:" v_pad="0" width="100">
                Options:
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 31e730a..c2424d7 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
@@ -259,6 +259,11 @@
                userdata="appearance" />
      <on_enable function="Edit.EnableCustomizeAvatar" />
    </menu_item_call>
+    <menu_item_call bottom="-362" enabled="true" height="19" label="Display Name..." left="0"
+                    mouse_opaque="true" name="Display Name..." width="153">
+        <on_click function="ShowFloater" userdata="displayname" />
+        <on_enable function="Edit.EnableDisplayName" />
+    </menu_item_call>
    <menu_item_separator />
    <menu_item_check name="Friends" label="Friends"
                     shortcut="control|shift|F">
@@ -267,7 +272,8 @@
      <on_check function="FloaterVisible"
                userdata="friends" />
    </menu_item_check>
-    <menu_item_call name="Groups" label="Groups">
+    <menu_item_call name="Groups" label="Groups"
+                    shortcut="control|shift|G">
      <on_click function="ShowAgentGroups"
                userdata="agent" />
    </menu_item_call>
@@ -1965,6 +1971,13 @@
        <on_click function="Advanced.DumpAttachments"
                  userdata="" />
      </menu_item_call>
+      <menu_item_call
+              label="Reload Avatar Cloud Particle"
+              name="Reload Avatar Cloud Particle">
+                <on_click
+                 function="Advanced.ReloadAvatarCloudParticle"
+                 userdata="" />
+      </menu_item_call>
    </menu>
    <!-- CRASH -->
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
index 61067da..5ee4ed0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
@@ -142,7 +142,7 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer010
                </impl>
        </mimetype>
        <mimetype name="video/*">
@@ -197,8 +197,8 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+      media_plugin_gstreamer010
-                </impl>
+    </impl>
        </mimetype>
        <mimetype name="application/pdf">
                <label name="application/pdf_label">
@@ -274,8 +274,8 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+      media_plugin_gstreamer010
-                </impl>
+    </impl>
        </mimetype>
        <mimetype name="audio/mpeg">
                <label name="audio/mpeg_label">
@@ -285,8 +285,8 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+      media_plugin_gstreamer010
-                </impl>
+    </impl>
        </mimetype>
        <mimetype name="audio/x-aiff">
                <label name="audio/x-aiff_label">
@@ -296,8 +296,8 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+      media_plugin_gstreamer010
-                </impl>
+    </impl>
        </mimetype>
        <mimetype name="audio/x-wav">
                <label name="audio/x-wav_label">
@@ -307,8 +307,8 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+      media_plugin_gstreamer010
-                </impl>
+    </impl>
        </mimetype>
        <mimetype menu="1" name="image/bmp">
                <label name="image/bmp_label">
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 6e361fa..d4d86c0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -5218,6 +5218,88 @@ The string [STRING_NAME] is missing from strings.xml
 </notification>
 <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameSuccess"
+   type="alert">
+Hi [DISPLAY_NAME]!
+Just like in real life, it takes a while for everyone to learn about a new name.  Please allow several days for your name to update in objects, scripts, search, etc.
+  </notification>
+  <notification
+ icon="alertmodal.tga"
+ name="SetDisplayNameBlocked"
+ type="alert">
+Sorry, you cannot change your display name. If you feel this is in error, please contact support.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameFailedLength"
+   type="alertmodal">
+Sorry, that name is too long.  Display names can have a maximum of [LENGTH] characters.
+Please try a shorter name.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameFailedGeneric"
+   type="alertmodal">
+    Sorry, we could not set your display name.  Please try again later.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameMismatch"
+   type="alertmodal">
+    The display names you entered do not match. Please re-enter.
+  </notification>
+  <!-- *NOTE: This should never happen -->
+  <notification
+   icon="alertmodal.tga"
+   name="AgentDisplayNameUpdateThresholdExceeded"
+   type="alertmodal">
+Sorry, you have to wait longer before you can change your display name.
+See http://wiki.secondlife.com/wiki/Setting_your_display_name
+Please try again later.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="AgentDisplayNameSetBlocked"
+   type="alertmodal">
+ Sorry, we could not set your requested name because it contains a banned word.
+ 
+ Please try a different name.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+ name="AgentDisplayNameSetInvalidUnicode"
+ type="alertmodal">
+    The display name you wish to set contains invalid characters.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+ name="AgentDisplayNameSetOnlyPunctuation"
+ type="alertmodal">
+    Your display name must contain letters other than punctuation.
+  </notification>
+  <notification
+   icon="notifytip.tga"
+   name="DisplayNameUpdate"
+   type="notifytip">
+    [OLD_NAME] ([SLID]) is now known as [NEW_NAME].
+  </notification>
+<notification
 icon="notifytip.tga"
 name="Cancelled"
 type="notifytip">
@@ -6855,7 +6937,7 @@ GRAVITY  --  -9.8
 *  --  Multiplication
 \  --  Division
-+  --  Addition
+  --  Addition
 -  --  Subtraction
 For information about this feature, click "More Info".
@@ -6884,7 +6966,7 @@ GLOW --  Glow
 *  --  Multiplication
 \  --  Division
-+  --  Addition
+  --  Addition
 -  --  Subtraction
 For information about this feature, click "More Info".
@@ -7202,6 +7284,24 @@ Apply this region's settings? (&quot;Ignore&quot; will ignore all region setting
 The new font will appear after you restart [VIEWER_NAME].
 </notification>
+<notification
+ icon="alertmodal.tga"
+ name="FirstPrivacy"
+ type="alertmodal">
+Terms of service of the grid you are connecting to require sending a "statistics packet" every 5 minutes.
+That is for example: Data about your hardware (CPU, RAM), number of avatars around, number of sims visited.
+Please check *the grids* privacy policy about usage of that data.
+  <form name="form">
+          <button
+                 index="0"
+                 name="ok"
+                 text="Login anyway"/>
+          <button
+                 index="1"
+                 name="notok"
+                 text="Do not log in"/>
+  </form>
+</notification>
 <!--End Imprudence notifications-->
 <!-- [KITTY VIEWER] -->
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 0df65e7..f459e6a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -127,6 +127,11 @@
                             font="SansSerifSmall" height="16" is_unicode="false" left="12"
                             max_length="254" mouse_opaque="false" name="name"
                             width="155" />
+      <name_editor bevel_style="in" border_style="line" visible="false"
+                             border_thickness="1" bottom="-24" enabled="false" follows="left|top"
+                             font="SansSerifSmall" height="16" is_unicode="false" left_delta="0"
+                             max_length="254" mouse_opaque="false" name="complete_name"
+                             width="155" />
      <button bottom_delta="0" font="SansSerif" halign="center" height="20"
           label="Copy Key" label_selected="Copy Key"
           left_delta="157" mouse_opaque="true" name="btn_copy_uuid" width="80" />
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 4b0b292..6ced7d6 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
@@ -2,6 +2,15 @@
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
     height="408" label="General" left="102" mouse_opaque="true"
     name="general_panel" width="517">
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+             mouse_opaque="true" name="start_location_textbox" v_pad="0" width="394">
+                Start Location:
+        </text>
+        <string name="region_name_prompt">
+                &lt;Type region name&gt;
+        </string>
  <combo_box name="default_location_combo"
             bottom="-22" left="155" height="16" width="150"
             follows="left|top" font="SansSerifSmall"
@@ -24,7 +33,13 @@
       font="SansSerifSmall" height="16" initial_value="true"
       label="Show start location at login screen" left="151" mouse_opaque="true"
       name="show_location_checkbox" radio_style="false" width="256" />
-        <combo_box bottom_delta="-25" follows="left|top" height="18" left="155"
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+             mouse_opaque="true" name="show_names_textbox" v_pad="0" width="394">
+                Nametags:
+        </text>
+        <combo_box bottom_delta="0" follows="left|top" height="18" left="155"
             mouse_opaque="true" name="fade_out_combobox" width="146">
                <combo_item name="Never" value="Never">
                        Never show
@@ -44,11 +59,35 @@
             font="SansSerifSmall" height="16" initial_value="false"
             label="Hide my name on my screen" left="151" name="show_my_name_checkbox"
             width="200" />
        <check_box bottom_delta="-20" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false"
             label="Highlight friends tags" left="151" name="highlight_friends_checkbox"
             width="200" />
        <text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0"
+             halign="left" height="16" left="10" name="Display_Names_textbox" v_pad="0"
+             width="394">
+                Display Names:
+        </text>
+        <radio_group name="displaynames" draw_border="false"
+               bottom_delta="0" left_delta="60" height="18"
+               follows="top|left"
+               control_name="DisplayNamesUsage">
+                <radio_item name="0" bottom_delta="-8" left_delta="40" height="18">
+                Legacy Names
+                </radio_item>
+                <radio_item name="1" bottom_delta="0" left_delta="50" height="18">
+                Display Names
+                </radio_item>
+                <radio_item name="2" bottom_delta="0" left_delta="50" height="18">
+                Show Both
+                </radio_item>
+        </radio_group>
+        <check_box bottom_delta="-20" follows="left|top" control_name="LegacyNamesForFriends"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Show legacy names for friends" left="151" name="legacy_friends_checkbox"
+             width="200" />
+        <text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0"
             halign="left" height="16" left="10" name="group_titles_textbox" v_pad="0"
             width="394">
                Group Titles:
@@ -61,37 +100,49 @@
             font="SansSerifSmall" height="16" initial_value="false"
             label="Hide my group title" left="330" name="show_my_title_checkbox"
             radio_style="false" width="256" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-210"
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+             mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
+                Selection Beam Color:
+        </text>
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-44"
             can_apply_immediately="false" color="1 1 1 1"
-             enabled="true" follows="left|top" height="65" label="" left="153"
+             enabled="true" follows="left|top" height="55" label="" left="153"
             mouse_opaque="true" name="effect_color_swatch"
-             tool_tip="Click to open Color Picker" width="55" />
+             tool_tip="Click to open Color Picker" width="45" />
  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
             mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
    UI Size:
  </text>
-  <slider bottom="-217" can_edit_text="true"
+  <slider bottom_delta="42" can_edit_text="true"
             decimal_digits="3" enabled="true" height="16" increment="0.001"
             initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
             name="ui_scale_slider" show_text="true" value="1" width="220" />
-  <button bottom="-221" enabled="true" follows="left|top"
+  <button bottom_delta="-48" enabled="true" follows="left|top"
             font="SansSerif" halign="center" height="22" label="Reset"
             label_selected="Reset" left_delta="226" mouse_opaque="true"
             name="reset_ui_size" scale_image="true" width="80" />
-  <check_box bottom="-236" enabled="true" follows="left|top"
+  <check_box bottom_delta="-14" enabled="true" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false"
             label="Use resolution independent scale" left="151" mouse_opaque="true"
             name="ui_auto_scale" radio_style="false" width="256" />
-  <check_box bottom="-260" enabled="true" follows="left|top"
+  <spinner bottom_delta="-24" decimal_digits="0" enabled="true"
-                   font="SansSerifSmall" height="16" initial_value="false"
-                   label="Go Away/AFK when idle" left="330" mouse_opaque="true"
-                   name="afk_timeout_checkbox" radio_style="false" width="256" />
-  <spinner bottom="-260" decimal_digits="0" enabled="true"
             follows="left|top" height="16" increment="1" initial_val="300"
             label="Away Timeout:" label_width="141" left="10" max_val="600"
             min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="6" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="220"
+             mouse_opaque="true" name="seconds_textbox" v_pad="0" width="128">
+                seconds
+        </text>
+    <check_box bottom_delta="-5" enabled="true" follows="left|top"
+                   font="SansSerifSmall" height="16" initial_value="false"
+                   label="Go Away/AFK when idle" left="330" mouse_opaque="true"
+                   name="afk_timeout_checkbox" radio_style="false" width="256" />
  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
       bottom_delta="-27" drop_shadow_visible="true" enabled="true" follows="left|top"
       font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
@@ -109,18 +160,18 @@
       mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
       width="256" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
             mouse_opaque="true" name="maturity_desired_label" v_pad="0" width="394">
                 Rating:
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="151"
             mouse_opaque="true" name="maturity_desired_prompt" v_pad="0" width="394">
                 I want to access content rated:
        </text>
-        <combo_box bottom="-318" follows="left|top" height="18" left="315"
+        <combo_box bottom_delta="-6" follows="left|top" height="18" left="315"
             mouse_opaque="true" name="maturity_desired_combobox" width="150">
                <combo_item name="Desired_Adult" value="42">
                        PG, Mature and Adult
@@ -133,58 +184,20 @@
                </combo_item>
        </combo_box>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="315"
             mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="150">
                 PG only
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-             mouse_opaque="true" name="start_location_textbox" v_pad="0" width="394">
-                Start Location:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-64" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-             mouse_opaque="true" name="show_names_textbox" v_pad="0" width="394">
-                Nametags:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-155" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-             mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
-                Selection Beam Color:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-254" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="220"
-             mouse_opaque="true" name="seconds_textbox" v_pad="0" width="128">
-                seconds
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-352" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
             mouse_opaque="true" name="time_textbox" v_pad="0" width="394">
                Clock:
        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        <combo_box allow_text_entry="false" bottom_delta="0" enabled="true" follows="left|top"
-             bottom="-384" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
-             mouse_opaque="true" name="language_textbox" v_pad="0" width="394">
-                Language:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-1" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="18" left_delta="293" mouse_opaque="true" name="language_textbox2"
-             v_pad="0" width="400">
-                (requires restart for full effect)
-        </text>
-        <string name="region_name_prompt">
-                &lt;Type region name&gt;
-        </string>
-        <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" name="12HourTime" value="PST 12">
@@ -197,7 +210,13 @@
                        UTC
                </combo_item>
        </combo_box>
-        <combo_box allow_text_entry="true" bottom="-382" enabled="true"
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
+             mouse_opaque="true" name="language_textbox" v_pad="0" width="394">
+                Language:
+        </text>
+        <combo_box allow_text_entry="true" bottom_delta="0" enabled="true"
             follows="left|top" height="16" left="153" max_chars="135"
             mouse_opaque="true" name="language_combobox" width="146">
                <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
@@ -255,5 +274,11 @@
                        한국어 (Korean) - Beta
                </combo_item>
        </combo_box>
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="0" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+             height="18" left_delta="150" mouse_opaque="true" name="language_textbox2"
+             v_pad="0" width="400">
+                (requires restart for full effect)
+        </text>
 </panel>