Merge branch 'armin/weekly' into weekly

79 files changed, 3443 insertions, 432 deletions

diff --git a/linden/indra/llaudio/llaudioengine.cpp b/linden/indra/llaudio/llaudioengine.cpp
index bed791a..6b0003a 100644
--- a/linden/indra/llaudio/llaudioengine.cpp
+++ b/linden/indra/llaudio/llaudioengine.cpp
@@ -36,7 +36,6 @@
 #include "linden_common.h"
 
 #include "llaudioengine.h"
-#include "llstreamingaudio.h"
 
 #include "llerror.h"
 #include "llmath.h"
@@ -48,7 +47,6 @@
 #include "llaudiodecodemgr.h"
 #include "llassetstorage.h"
 
-
 // necessary for grabbing sounds from sim (implemented in viewer)       
 extern void request_sound(const LLUUID &sound_guid);
 
@@ -70,16 +68,6 @@ LLAudioEngine::~LLAudioEngine()
 {
 }
 
-LLStreamingAudioInterface* LLAudioEngine::getStreamingAudioImpl()
-{
-        return mStreamingAudioImpl;
-}
-
-void LLAudioEngine::setStreamingAudioImpl(LLStreamingAudioInterface *impl)
-{
-        mStreamingAudioImpl = impl;
-}
-
 void LLAudioEngine::setDefaults()
 {
         mMaxWindGain = 1.f;
@@ -108,8 +96,6 @@ void LLAudioEngine::setDefaults()
         mInternalGain = 0.f;
         mNextWindUpdate = 0.f;
 
-        mStreamingAudioImpl = NULL;
-
         for (U32 i = 0; i < LLAudioEngine::AUDIO_TYPE_COUNT; i++)
                 mSecondaryGain[i] = 1.0f;
 }
@@ -174,62 +160,6 @@ void LLAudioEngine::shutdown()
         }
 }
 
-
-// virtual
-void LLAudioEngine::startInternetStream(const std::string& url)
-{
-        if (mStreamingAudioImpl)
-                mStreamingAudioImpl->start(url);
-}
-
-
-// virtual
-void LLAudioEngine::stopInternetStream()
-{
-        if (mStreamingAudioImpl)
-                mStreamingAudioImpl->stop();
-}
-
-// virtual
-void LLAudioEngine::pauseInternetStream(int pause)
-{
-        if (mStreamingAudioImpl)
-                mStreamingAudioImpl->pause(pause);
-}
-
-// virtual
-void LLAudioEngine::updateInternetStream()
-{
-        if (mStreamingAudioImpl)
-                mStreamingAudioImpl->update();
-}
-
-// virtual
-int LLAudioEngine::isInternetStreamPlaying()
-{
-        if (mStreamingAudioImpl)
-                return mStreamingAudioImpl->isPlaying();
-
-        return 0; // Stopped
-}
-
-
-// virtual
-void LLAudioEngine::setInternetStreamGain(F32 vol)
-{
-        if (mStreamingAudioImpl)
-                mStreamingAudioImpl->setGain(vol);
-}
-
-// virtual
-std::string LLAudioEngine::getInternetStreamURL()
-{
-        if (mStreamingAudioImpl)
-                return mStreamingAudioImpl->getURL();
-        else return std::string();
-}
-
-
 void LLAudioEngine::updateChannels()
 {
         S32 i;
@@ -512,7 +442,6 @@ void LLAudioEngine::idle(F32 max_decode_time)
         // or request new data.
         startNextTransfer();
 
-        updateInternetStream();
 }
 
 
@@ -754,14 +683,6 @@ F32 LLAudioEngine::getSecondaryGain(S32 type)
         return mSecondaryGain[type];
 }
 
-F32 LLAudioEngine::getInternetStreamGain()
-{
-        if (mStreamingAudioImpl)
-                return mStreamingAudioImpl->getGain();
-        else
-                return 1.0f;
-}
-
 void LLAudioEngine::setMaxWindGain(F32 gain)
 {
         mMaxWindGain = gain;
diff --git a/linden/indra/llaudio/llaudioengine.h b/linden/indra/llaudio/llaudioengine.h
index a1b240e..7237ce2 100644
--- a/linden/indra/llaudio/llaudioengine.h
+++ b/linden/indra/llaudio/llaudioengine.h
@@ -71,8 +71,6 @@ class LLAudioData;
 class LLAudioChannel;
 class LLAudioChannelOpenAL;
 class LLAudioBuffer;
-class LLStreamingAudioInterface;
-
 
 //
 //  LLAudioEngine definition
@@ -119,16 +117,13 @@ public:
         // stops playing new sounds.
         void setMuted(bool muted);
         bool getMuted() const { return mMuted; }
-#ifdef USE_PLUGIN_MEDIA
-        LLPluginClassMedia* initializeMedia(const std::string& media_type);
-#endif
+
         F32 getMasterGain();
         void setMasterGain(F32 gain);
 
         F32 getSecondaryGain(S32 type);
         void setSecondaryGain(S32 type, F32 gain);
 
-        F32 getInternetStreamGain();
 
         virtual void setDopplerFactor(F32 factor);
         virtual F32 getDopplerFactor();
@@ -150,19 +145,6 @@ public:
         LLAudioSource *findAudioSource(const LLUUID &source_id);
         LLAudioData *getAudioData(const LLUUID &audio_uuid);
 
-        // Internet stream implementation manipulation
-        LLStreamingAudioInterface *getStreamingAudioImpl();
-        void setStreamingAudioImpl(LLStreamingAudioInterface *impl);
-        // Internet stream methods - these will call down into the *mStreamingAudioImpl if it exists
-        void startInternetStream(const std::string& url);
-        void stopInternetStream();
-        void pauseInternetStream(int pause);
-        void updateInternetStream(); // expected to be called often
-        int isInternetStreamPlaying();
-        // use a value from 0.0 to 1.0, inclusive
-        void setInternetStreamGain(F32 vol);
-        std::string getInternetStreamURL();
-        
         // For debugging usage
         virtual LLVector3 getListenerPos();
 
@@ -247,7 +229,6 @@ protected:
 
 private:
         void setDefaults();
-        LLStreamingAudioInterface *mStreamingAudioImpl;
 };
 
 
diff --git a/linden/indra/llaudio/llstreamingaudio.h b/linden/indra/llaudio/llstreamingaudio.h
index aa89e6a..f5d5334 100644
--- a/linden/indra/llaudio/llstreamingaudio.h
+++ b/linden/indra/llaudio/llstreamingaudio.h
@@ -36,7 +36,7 @@
 
 #include "stdtypes.h" // from llcommon
 
-// Entirely abstract.  Based exactly on the historic API.
+// Entirely abstract.  Based on the historic API.
 class LLStreamingAudioInterface
 {
  public:
@@ -51,6 +51,7 @@ class LLStreamingAudioInterface
         virtual void setGain(F32 vol) = 0;
         virtual F32 getGain() = 0;
         virtual std::string getURL() = 0;
+        virtual std::string getVersion() = 0;
 };
 
 #endif // LL_STREAMINGAUDIO_H
diff --git a/linden/indra/llcharacter/llcharacter.cpp b/linden/indra/llcharacter/llcharacter.cpp
index 46ac326..72cef83 100644
--- a/linden/indra/llcharacter/llcharacter.cpp
+++ b/linden/indra/llcharacter/llcharacter.cpp
@@ -379,7 +379,7 @@ void LLCharacter::clearVisualParamWeights()
                 param;
                 param = getNextVisualParam())
         {
-                if (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE)
+                if (param->isTweakable())
                 {
                         param->setWeight( param->getDefaultWeight(), FALSE );
                 }
@@ -395,7 +395,7 @@ BOOL LLCharacter::visualParamWeightsAreDefault()
                 param;
                 param = getNextVisualParam())
         {
-                if (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE)
+                if (param->isTweakable())
                 {
                         if (param->getWeight() != param->getDefaultWeight())
                                 return false;
diff --git a/linden/indra/llcharacter/llcharacter.h b/linden/indra/llcharacter/llcharacter.h
index d91124b..7630760 100644
--- a/linden/indra/llcharacter/llcharacter.h
+++ b/linden/indra/llcharacter/llcharacter.h
@@ -231,6 +231,20 @@ public:
                 return (mCurIterator++)->second;
         }
 
+        S32 getVisualParamCountInGroup(EVisualParamGroup group)
+        {
+                S32 rtn = 0;
+                VisualParamIndexMap_t::iterator iter;
+                for (iter = mVisualParamIndexMap.begin(); iter != mVisualParamIndexMap.end(); iter++)
+                {
+                        if (iter->second->getGroup() == group)
+                        {
+                                rtn++;
+                        }
+                }
+                return rtn;
+        }
+
         LLVisualParam*  getVisualParam(S32 id)
         {
                 VisualParamIndexMap_t::iterator iter = mVisualParamIndexMap.find(id);
diff --git a/linden/indra/llcharacter/llvisualparam.cpp b/linden/indra/llcharacter/llvisualparam.cpp
index d7a144e..9579ff8 100644
--- a/linden/indra/llcharacter/llvisualparam.cpp
+++ b/linden/indra/llcharacter/llvisualparam.cpp
@@ -238,7 +238,7 @@ void LLVisualParam::setAnimationTarget(F32 target_value, BOOL set_by_user)
 {
         if (mInfo)
         {
-                if (getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE)
+                if (isTweakable())
                 {
                         mTargetWeight = llclamp(target_value, mInfo->mMinWeight, mInfo->mMaxWeight);
                 }
@@ -282,7 +282,7 @@ void LLVisualParam::animate( F32 delta, BOOL set_by_user )
 //-----------------------------------------------------------------------------
 void LLVisualParam::stopAnimating(BOOL set_by_user)
 { 
-        if (mIsAnimating && getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE)
+        if (mIsAnimating && isTweakable())
         {
                 mIsAnimating = FALSE; 
                 setWeight(mTargetWeight, set_by_user);
diff --git a/linden/indra/llcharacter/llvisualparam.h b/linden/indra/llcharacter/llvisualparam.h
index 3a0c1bb..d8dff8c 100644
--- a/linden/indra/llcharacter/llvisualparam.h
+++ b/linden/indra/llcharacter/llvisualparam.h
@@ -51,6 +51,7 @@ enum EVisualParamGroup
 {
         VISUAL_PARAM_GROUP_TWEAKABLE,
         VISUAL_PARAM_GROUP_ANIMATABLE,
+        VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT,
         NUM_VISUAL_PARAM_GROUPS
 };
 
@@ -124,7 +125,7 @@ public:
         void                                    setMaxDisplayName(const std::string& s) { mInfo->mMaxName = s; }
         void                                    setMinDisplayName(const std::string& s) { mInfo->mMinName = s; }
 
-        EVisualParamGroup               getGroup()                      { return mInfo->mGroup; }
+        EVisualParamGroup               getGroup() const        { return mInfo->mGroup; }
         F32                                             getMinWeight()          { return mInfo->mMinWeight; }
         F32                                             getMaxWeight()          { return mInfo->mMaxWeight; }
         F32                                             getDefaultWeight()      { return mInfo->mDefaultWeight; }
@@ -133,7 +134,8 @@ public:
         F32                                             getWeight()             { return mIsAnimating ? mTargetWeight : mCurWeight; }
         F32                                             getCurrentWeight()      { return mCurWeight; }
         F32                                             getLastWeight()         { return mLastWeight; }
-        BOOL                                    isAnimating()   { return mIsAnimating; }
+        BOOL                                    isAnimating()           { return mIsAnimating; }
+        BOOL                                    isTweakable()           { return (getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE)  || (getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT); }
 
         LLVisualParam*                  getNextParam()          { return mNext; }
         void                                    setNextParam( LLVisualParam *next );
@@ -141,6 +143,7 @@ public:
         virtual void                    setAnimating(BOOL is_animating) { mIsAnimating = is_animating; }
         BOOL                                    getAnimating() { return mIsAnimating; }
 
+
 protected:
         F32                                     mCurWeight;                     // current weight
         F32                                     mLastWeight;            // last weight
diff --git a/linden/indra/llcommon/CMakeLists.txt b/linden/indra/llcommon/CMakeLists.txt
index ff1d548..eaaccfc 100644
--- a/linden/indra/llcommon/CMakeLists.txt
+++ b/linden/indra/llcommon/CMakeLists.txt
@@ -18,6 +18,7 @@ set(llcommon_SOURCE_FILES
     llapp.cpp
     llapr.cpp
     llassettype.cpp
+    llavatarname.cpp
     llbase32.cpp
     llbase64.cpp
     llcommon.cpp
@@ -87,6 +88,7 @@ set(llcommon_HEADER_FILES
     llassettype.h
     llassoclist.h
     llavatarconstants.h
+    llavatarname.h
     llbase32.h
     llbase64.h
     llboost.h
diff --git a/linden/indra/llcommon/llavatarname.cpp b/linden/indra/llcommon/llavatarname.cpp
new file mode 100644
index 0000000..ebe8c88
--- /dev/null
+++ b/linden/indra/llcommon/llavatarname.cpp
@@ -0,0 +1,150 @@
+/** 
+ * @file llavatarname.cpp
+ * @brief Represents name-related data for an avatar, such as the
+ * username/SLID ("bobsmith123" or "james.linden") and the display
+ * name ("James Cook")
+ *
+ * $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 "linden_common.h"
+
+#include "llavatarname.h"
+
+#include "lldate.h"
+#include "llsd.h"
+
+bool LLAvatarName::sOmitResidentAsLastName = false;
+
+// Store these in pre-built std::strings to avoid memory allocations in
+// LLSD map lookups
+static const std::string USERNAME("username");
+static const std::string DISPLAY_NAME("display_name");
+static const std::string LEGACY_FIRST_NAME("legacy_first_name");
+static const std::string LEGACY_LAST_NAME("legacy_last_name");
+static const std::string IS_DISPLAY_NAME_DEFAULT("is_display_name_default");
+static const std::string DISPLAY_NAME_EXPIRES("display_name_expires");
+static const std::string DISPLAY_NAME_NEXT_UPDATE("display_name_next_update");
+
+LLAvatarName::LLAvatarName()
+:       mUsername(),
+        mDisplayName(),
+        mLegacyFirstName(),
+        mLegacyLastName(),
+        mIsDisplayNameDefault(false),
+        mIsDummy(false),
+        mExpires(F64_MAX),
+        mNextUpdate(0.0)
+{ }
+
+bool LLAvatarName::operator<(const LLAvatarName& rhs) const
+{
+        if (mUsername == rhs.mUsername)
+                return mDisplayName < rhs.mDisplayName;
+        else
+                return mUsername < rhs.mUsername;
+}
+
+LLSD LLAvatarName::asLLSD() const
+{
+        LLSD sd;
+        sd[USERNAME] = mUsername;
+        sd[DISPLAY_NAME] = mDisplayName;
+        sd[LEGACY_FIRST_NAME] = mLegacyFirstName;
+        sd[LEGACY_LAST_NAME] = mLegacyLastName;
+        sd[IS_DISPLAY_NAME_DEFAULT] = mIsDisplayNameDefault;
+        sd[DISPLAY_NAME_EXPIRES] = LLDate(mExpires);
+        sd[DISPLAY_NAME_NEXT_UPDATE] = LLDate(mNextUpdate);
+        return sd;
+}
+
+void LLAvatarName::fromLLSD(const LLSD& sd)
+{
+        mUsername = sd[USERNAME].asString();
+        mDisplayName = sd[DISPLAY_NAME].asString();
+        mLegacyFirstName = sd[LEGACY_FIRST_NAME].asString();
+        mLegacyLastName = sd[LEGACY_LAST_NAME].asString();
+        mIsDisplayNameDefault = sd[IS_DISPLAY_NAME_DEFAULT].asBoolean();
+        LLDate expires = sd[DISPLAY_NAME_EXPIRES];
+        mExpires = expires.secondsSinceEpoch();
+        LLDate next_update = sd[DISPLAY_NAME_NEXT_UPDATE];
+        mNextUpdate = next_update.secondsSinceEpoch();
+}
+
+std::string LLAvatarName::getCompleteName() const
+{
+        std::string name;
+        if (!mUsername.empty())
+        {
+                name = mDisplayName + " (" + mUsername + ")";
+        }
+        else
+        {
+                // ...display names are off, legacy name is in mDisplayName
+                name = mDisplayName;
+        }
+        return name;
+}
+
+std::string LLAvatarName::getLegacyName() const
+{
+        std::string name;
+        name.reserve(mLegacyFirstName.size() + 1 + mLegacyLastName.size());
+        name = mLegacyFirstName;
+        if (!sOmitResidentAsLastName || mLegacyLastName != "Resident")
+        {
+                name += " ";
+                name += mLegacyLastName;
+        }
+        return name;
+}
+
+std::string LLAvatarName::getNames(bool linefeed) const
+{
+        std::string name;
+
+        if (mUsername.empty())
+        {
+                // ...display names are off, legacy name is in mDisplayName
+                name = mDisplayName;
+                if (sOmitResidentAsLastName)
+                {
+                        LLStringUtil::replaceString(name, " Resident", "");
+                }
+        }
+        else
+        {
+                name = getLegacyName();
+                if (name != mDisplayName)
+                {
+                        if (linefeed)
+                        {
+                                name = mDisplayName + "\n[" + name + "]";
+                        }
+                        else
+                        {
+                                name = mDisplayName + " [" + name + "]";
+                        }
+                }
+        }
+
+        return name;
+}
diff --git a/linden/indra/llcommon/llavatarname.h b/linden/indra/llcommon/llavatarname.h
new file mode 100644
index 0000000..3b6c6ea
--- /dev/null
+++ b/linden/indra/llcommon/llavatarname.h
@@ -0,0 +1,105 @@
+/** 
+ * @file llavatarname.h
+ * @brief Represents name-related data for an avatar, such as the
+ * username/SLID ("bobsmith123" or "james.linden") and the display
+ * name ("James Cook")
+ *
+ * $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 LLAVATARNAME_H
+#define LLAVATARNAME_H
+
+#include <string>
+
+class LLSD;
+
+class LL_COMMON_API LLAvatarName
+{
+public:
+        LLAvatarName();
+        
+        bool operator<(const LLAvatarName& rhs) const;
+
+        LLSD asLLSD() const;
+
+        void fromLLSD(const LLSD& sd);
+
+        // For normal names, returns "James Linden (james.linden)"
+        // When display names are disabled returns just "James Linden"
+        std::string getCompleteName() const;
+
+        // For normal names, returns "Whatever Display Name (John Doe)" when
+        // display name and legacy name are different, or just "John Doe"
+        // when they are equal or when display names are disabled.
+        // When linefeed == true, the space between the display name and
+        // the opening parenthesis for the legacy name is replaced with a
+        // line feed.
+        std::string getNames(bool linefeed = false) const;
+
+        // Returns "James Linden" or "bobsmith123 Resident" for backwards
+        // compatibility with systems like voice and muting
+        std::string getLegacyName() const;
+
+        // "bobsmith123" or "james.linden", US-ASCII only
+        std::string mUsername;
+
+        // "Jose' Sanchez" or "James Linden", UTF-8 encoded Unicode
+        // Contains data whether or not user has explicitly set
+        // a display name; may duplicate their username.
+        std::string mDisplayName;
+
+        // For "James Linden", "James"
+        // For "bobsmith123", "bobsmith123"
+        // Used to communicate with legacy systems like voice and muting which
+        // rely on old-style names.
+        std::string mLegacyFirstName;
+
+        // For "James Linden", "Linden"
+        // For "bobsmith123", "Resident"
+        // see above for rationale
+        std::string mLegacyLastName;
+
+        // If true, both display name and SLID were generated from
+        // a legacy first and last name, like "James Linden (james.linden)"
+        bool mIsDisplayNameDefault;
+
+        // Under error conditions, we may insert "dummy" records with
+        // names equal to legacy name into caches as placeholders.
+        // These can be shown in UI, but are not serialized.
+        bool mIsDummy;
+
+        // Names can change, so need to keep track of when name was
+        // last checked.
+        // Unix time-from-epoch seconds for efficiency
+        F64 mExpires;
+        
+        // You can only change your name every N hours, so record
+        // when the next update is allowed
+        // Unix time-from-epoch seconds
+        F64 mNextUpdate;
+
+        // true to prevent the displaying of "Resident" as a last name
+        // in legacy names
+        static bool sOmitResidentAsLastName;
+};
+
+#endif
diff --git a/linden/indra/llmessage/CMakeLists.txt b/linden/indra/llmessage/CMakeLists.txt
index a5e4249..9965191 100644
--- a/linden/indra/llmessage/CMakeLists.txt
+++ b/linden/indra/llmessage/CMakeLists.txt
@@ -22,6 +22,7 @@ include_directories(
 set(llmessage_SOURCE_FILES
     llares.cpp
     llassetstorage.cpp
+    llavatarnamecache.cpp
     llblowfishcipher.cpp
     llbuffer.cpp
     llbufferstream.cpp
@@ -105,6 +106,7 @@ set(llmessage_HEADER_FILES
 
     llares.h
     llassetstorage.h
+    llavatarnamecache.h
     llblowfishcipher.h
     llbuffer.h
     llbufferstream.h
diff --git a/linden/indra/llmessage/llavatarnamecache.cpp b/linden/indra/llmessage/llavatarnamecache.cpp
new file mode 100644
index 0000000..180274e
--- /dev/null
+++ b/linden/indra/llmessage/llavatarnamecache.cpp
@@ -0,0 +1,859 @@
+/** 
+ * @file llavatarnamecache.cpp
+ * @brief Provides lookup of avatar SLIDs ("bobsmith123") and display names
+ * ("James Cook") from avatar UUIDs.
+ *
+ * $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 "linden_common.h"
+
+#include "llavatarnamecache.h"
+
+#include "llcachename.h"                // we wrap this system
+#include "llframetimer.h"
+#include "llhttpclient.h"
+#include "llsd.h"
+#include "llsdserialize.h"
+
+#include <boost/tokenizer.hpp>
+
+#include <map>
+#include <set>
+
+namespace LLAvatarNameCache
+{
+        use_display_name_signal_t mUseDisplayNamesSignal;
+
+        // Manual override for display names: 0 = legacy names,
+        // 1 = display name and legacy name, 2 = display name (legacy if absent)
+        U32 sUseDisplayNames = 0;
+
+        // Cache starts in a paused state until we can determine if the
+        // current region supports display names.
+        bool sRunning = false;
+        
+        // Base lookup URL for name service.
+        // On simulator, loaded from indra.xml
+        // On viewer, usually a simulator capability (at People API team's request)
+        // Includes the trailing slash, like "http://pdp60.lindenlab.com:8000/agents/"
+        std::string sNameLookupURL;
+
+        // accumulated agent IDs for next query against service
+        typedef std::set<LLUUID> ask_queue_t;
+        ask_queue_t sAskQueue;
+
+        // agent IDs that have been requested, but with no reply
+        // maps agent ID to frame time request was made
+        typedef std::map<LLUUID, F64> pending_queue_t;
+        pending_queue_t sPendingQueue;
+
+        // Callbacks to fire when we received a name.
+        // May have multiple callbacks for a single ID, which are
+        // represented as multiple slots bound to the signal.
+        // Avoid copying signals via pointers.
+        typedef std::map<LLUUID, callback_signal_t*> signal_map_t;
+        signal_map_t sSignalMap;
+
+        // names we know about
+        typedef std::map<LLUUID, LLAvatarName> cache_t;
+        cache_t sCache;
+
+        // Send bulk lookup requests a few times a second at most
+        // only need per-frame timing resolution
+        LLFrameTimer sRequestTimer;
+
+        // Periodically clean out expired entries from the cache
+        //LLFrameTimer sEraseExpiredTimer;
+
+        //-----------------------------------------------------------------------
+        // Internal methods
+        //-----------------------------------------------------------------------
+
+        // Handle name response off network.
+        // Optionally skip adding to cache, used when this is a fallback to the
+        // legacy name system.
+        void processName(const LLUUID& agent_id,
+                                         const LLAvatarName& av_name,
+                                         bool add_to_cache);
+
+        void requestNamesViaCapability();
+
+        // Legacy name system callback
+        void legacyNameCallback(const LLUUID& agent_id,
+                                                        const std::string& first, const std::string& last,
+                                                        BOOL is_group, void* data);
+
+        void requestNamesViaLegacy();
+
+        // Fill in an LLAvatarName with the legacy name data
+        void buildLegacyName(const std::string& full_name,
+                                                 LLAvatarName* av_name);
+
+        // Do a single callback to a given slot
+        void fireSignal(const LLUUID& agent_id,
+                                        const callback_slot_t& slot,
+                                        const LLAvatarName& av_name);
+        
+        // Is a request in-flight over the network?
+        bool isRequestPending(const LLUUID& agent_id);
+
+        // Erase expired names from cache
+        void eraseExpired();
+
+        bool expirationFromCacheControl(LLSD headers, F64 *expires);
+}
+
+/* Sample response:
+<?xml version="1.0"?>
+<llsd>
+  <map>
+    <key>agents</key>
+    <array>
+      <map>
+        <key>display_name_next_update</key>
+        <date>2010-04-16T21:34:02+00:00Z</date>
+        <key>display_name_expires</key>
+        <date>2010-04-16T21:32:26.142178+00:00Z</date>
+        <key>display_name</key>
+        <string>MickBot390 LLQABot</string>
+        <key>sl_id</key>
+        <string>mickbot390.llqabot</string>
+        <key>id</key>
+        <string>0012809d-7d2d-4c24-9609-af1230a37715</string>
+        <key>is_display_name_default</key>
+        <boolean>false</boolean>
+      </map>
+      <map>
+        <key>display_name_next_update</key>
+        <date>2010-04-16T21:34:02+00:00Z</date>
+        <key>display_name_expires</key>
+        <date>2010-04-16T21:32:26.142178+00:00Z</date>
+        <key>display_name</key>
+        <string>Bjork Gudmundsdottir</string>
+        <key>sl_id</key>
+        <string>sardonyx.linden</string>
+        <key>id</key>
+        <string>3941037e-78ab-45f0-b421-bd6e77c1804d</string>
+        <key>is_display_name_default</key>
+        <boolean>true</boolean>
+      </map>
+    </array>
+  </map>
+</llsd>
+*/
+
+class LLAvatarNameResponder : public LLHTTPClient::Responder
+{
+private:
+        // need to store agent ids that are part of this request in case of
+        // an error, so we can flag them as unavailable
+        std::vector<LLUUID> mAgentIDs;
+
+        // Need the headers to look up Expires: and Retry-After:
+        LLSD mHeaders;
+        
+public:
+        LLAvatarNameResponder(const std::vector<LLUUID>& agent_ids)
+        :       mAgentIDs(agent_ids),
+                mHeaders()
+        { }
+        
+        /*virtual*/ void completedHeader(U32 status, const std::string& reason, 
+                const LLSD& headers)
+        {
+                mHeaders = headers;
+        }
+
+        /*virtual*/ void result(const LLSD& content)
+        {
+                // Pull expiration out of headers if available
+                F64 expires = LLAvatarNameCache::nameExpirationFromHeaders(mHeaders);
+
+                LLSD agents = content["agents"];
+                LLSD::array_const_iterator it;
+                for (it = agents.beginArray(); it != agents.endArray(); ++it)
+                {
+                        const LLSD& row = *it;
+                        LLUUID agent_id = row["id"].asUUID();
+
+                        LLAvatarName av_name;
+                        av_name.fromLLSD(row);
+
+                        // Use expiration time from header
+                        av_name.mExpires = expires;
+
+                        // Some avatars don't have explicit display names set
+                        if (av_name.mDisplayName.empty())
+                        {
+                                av_name.mDisplayName = av_name.mUsername;
+                        }
+
+                        // cache it and fire signals
+                        LLAvatarNameCache::processName(agent_id, av_name, true);
+                }
+
+                // Same logic as error response case
+                LLSD unresolved_agents = content["bad_ids"];
+                if (unresolved_agents.size() > 0)
+                {
+                        std::string first, last;
+                        LLAvatarName av_name;
+                        av_name.mIsDisplayNameDefault = false;
+                        av_name.mIsDummy = true;
+                        av_name.mExpires = expires;
+
+                        for (it = unresolved_agents.beginArray(); it != unresolved_agents.endArray(); ++it)
+                        {
+                                const LLUUID& agent_id = *it;
+                                gCacheName->getName(agent_id, first, last);
+                                av_name.mLegacyFirstName = first;
+                                av_name.mLegacyLastName = last;
+                                av_name.mDisplayName = first;
+                                if (last == "Resident")
+                                {
+                                        av_name.mDisplayName = first;
+                                        av_name.mUsername = first;
+                                }
+                                else
+                                {
+                                        av_name.mDisplayName = first + " " + last;
+                                        av_name.mUsername = first + "." + last;
+                                }
+                                LLStringUtil::toLower(av_name.mUsername);
+                                // cache it and fire signals
+                                LLAvatarNameCache::processName(agent_id, av_name, true);
+                        }
+                }
+        }
+
+        /*virtual*/ void error(U32 status, const std::string& reason)
+        {
+                // We're going to construct a dummy record and cache it for a while,
+                // either briefly for a 503 Service Unavailable, or longer for other
+                // errors.
+                F64 retry_timestamp = errorRetryTimestamp(status);
+
+                std::string first, last;
+                LLAvatarName av_name;
+                av_name.mIsDisplayNameDefault = false;
+                av_name.mIsDummy = true;
+                av_name.mExpires = retry_timestamp;
+
+                // Add dummy records for all agent IDs in this request
+                std::vector<LLUUID>::const_iterator it;
+                for (it = mAgentIDs.begin(); it != mAgentIDs.end(); ++it)
+                {
+                        const LLUUID& agent_id = *it;
+                        gCacheName->getName(agent_id, first, last);
+                        av_name.mLegacyFirstName = first;
+                        av_name.mLegacyLastName = last;
+                        av_name.mDisplayName = first;
+                        if (last == "Resident")
+                        {
+                                av_name.mDisplayName = first;
+                                av_name.mUsername = first;
+                        }
+                        else
+                        {
+                                av_name.mDisplayName = first + " " + last;
+                                av_name.mUsername = first + "." + last;
+                        }
+                        LLStringUtil::toLower(av_name.mUsername);
+                        // cache it and fire signals
+                        LLAvatarNameCache::processName(agent_id, av_name, true);
+                }
+        }
+
+        // Return time to retry a request that generated an error, based on
+        // error type and headers.  Return value is seconds-since-epoch.
+        F64 errorRetryTimestamp(S32 status)
+        {
+                F64 now = LLFrameTimer::getTotalSeconds();
+
+                // Retry-After takes priority
+                LLSD retry_after = mHeaders["retry-after"];
+                if (retry_after.isDefined())
+                {
+                        // We only support the delta-seconds type
+                        S32 delta_seconds = retry_after.asInteger();
+                        if (delta_seconds > 0)
+                        {
+                                // ...valid delta-seconds
+                                return now + F64(delta_seconds);
+                        }
+                }
+
+                // If no Retry-After, look for Cache-Control max-age
+                F64 expires = 0.0;
+                if (LLAvatarNameCache::expirationFromCacheControl(mHeaders, &expires))
+                {
+                        return expires;
+                }
+
+                // No information in header, make a guess
+                if (status == 503)
+                {
+                        // ...service unavailable, retry soon
+                        const F64 SERVICE_UNAVAILABLE_DELAY = 600.0; // 10 min
+                        return now + SERVICE_UNAVAILABLE_DELAY;
+                }
+                else
+                {
+                        // ...other unexpected error
+                        const F64 DEFAULT_DELAY = 3600.0; // 1 hour
+                        return now + DEFAULT_DELAY;
+                }
+        }
+};
+
+void LLAvatarNameCache::processName(const LLUUID& agent_id,
+                                                                        const LLAvatarName& av_name,
+                                                                        bool add_to_cache)
+{
+        if (add_to_cache)
+        {
+                sCache[agent_id] = av_name;
+        }
+
+        sPendingQueue.erase(agent_id);
+
+        // signal everyone waiting on this name
+        signal_map_t::iterator sig_it = sSignalMap.find(agent_id);
+        if (sig_it != sSignalMap.end())
+        {
+                callback_signal_t* signal = sig_it->second;
+                (*signal)(agent_id, av_name);
+
+                sSignalMap.erase(agent_id);
+
+                delete signal;
+                signal = NULL;
+        }
+}
+
+void LLAvatarNameCache::requestNamesViaCapability()
+{
+        F64 now = LLFrameTimer::getTotalSeconds();
+
+        // URL format is like:
+        // http://pdp60.lindenlab.com:8000/agents/?ids=3941037e-78ab-45f0-b421-bd6e77c1804d&ids=0012809d-7d2d-4c24-9609-af1230a37715&ids=0019aaba-24af-4f0a-aa72-6457953cf7f0
+        //
+        // Apache can handle URLs of 4096 chars, but let's be conservative
+        const U32 NAME_URL_MAX = 4096;
+        const U32 NAME_URL_SEND_THRESHOLD = 3000;
+        std::string url;
+        url.reserve(NAME_URL_MAX);
+
+        std::vector<LLUUID> agent_ids;
+        agent_ids.reserve(128);
+        
+        ask_queue_t::const_iterator it = sAskQueue.begin();
+        for ( ; it != sAskQueue.end(); ++it)
+        {
+                const LLUUID& agent_id = *it;
+
+                if (url.empty())
+                {
+                        // ...starting new request
+                        url += sNameLookupURL;
+                        url += "?ids=";
+                }
+                else
+                {
+                        // ...continuing existing request
+                        url += "&ids=";
+                }
+                url += agent_id.asString();
+                agent_ids.push_back(agent_id);
+
+                // mark request as pending
+                sPendingQueue[agent_id] = now;
+
+                if (url.size() > NAME_URL_SEND_THRESHOLD)
+                {
+                        //llinfos << "requestNames " << url << llendl;
+                        LLHTTPClient::get(url, new LLAvatarNameResponder(agent_ids));
+                        url.clear();
+                        agent_ids.clear();
+                }
+        }
+
+        if (!url.empty())
+        {
+                //llinfos << "requestNames " << url << llendl;
+                LLHTTPClient::get(url, new LLAvatarNameResponder(agent_ids));
+                url.clear();
+                agent_ids.clear();
+        }
+
+        // We've moved all asks to the pending request queue
+        sAskQueue.clear();
+}
+
+void LLAvatarNameCache::legacyNameCallback(const LLUUID& agent_id,
+                                                                                   const std::string& first, const std::string& last,
+                                                                                   BOOL is_group, void* data)
+{
+        std::string full_name = first + " " + last;
+        // Construct a dummy record for this name.  By convention, SLID is blank
+        // Never expires, but not written to disk, so lasts until end of session.
+        LLAvatarName av_name;
+        buildLegacyName(full_name, &av_name);
+
+        // Don't add to cache, the data already exists in the legacy name system
+        // cache and we don't want or need duplicate storage, because keeping the
+        // two copies in sync is complex.
+        processName(agent_id, av_name, false);
+}
+
+void LLAvatarNameCache::requestNamesViaLegacy()
+{
+        F64 now = LLFrameTimer::getTotalSeconds();
+        std::string full_name;
+        ask_queue_t::const_iterator it = sAskQueue.begin();
+        for (; it != sAskQueue.end(); ++it)
+        {
+                const LLUUID& agent_id = *it;
+
+                // Mark as pending first, just in case the callback is immediately
+                // invoked below.  This should never happen in practice.
+                sPendingQueue[agent_id] = now;
+
+                gCacheName->get(agent_id, false, legacyNameCallback);
+        }
+
+        // We've either answered immediately or moved all asks to the
+        // pending queue
+        sAskQueue.clear();
+}
+
+void LLAvatarNameCache::initClass(bool running)
+{
+        sRunning = running;
+}
+
+void LLAvatarNameCache::cleanupClass()
+{
+}
+
+void LLAvatarNameCache::importFile(std::istream& istr)
+{
+        LLSD data;
+        S32 parse_count = LLSDSerialize::fromXMLDocument(data, istr);
+        if (parse_count < 1) return;
+
+        // by convention LLSD storage is a map
+        // we only store one entry in the map
+        LLSD agents = data["agents"];
+
+        LLUUID agent_id;
+        LLAvatarName av_name;
+        LLSD::map_const_iterator it = agents.beginMap();
+        for ( ; it != agents.endMap(); ++it)
+        {
+                agent_id.set(it->first);
+                av_name.fromLLSD( it->second );
+                sCache[agent_id] = av_name;
+        }
+        // entries may have expired since we last ran the viewer, just
+        // clean them out now
+        eraseExpired();
+        llinfos << "loaded " << sCache.size() << llendl;
+}
+
+void LLAvatarNameCache::exportFile(std::ostream& ostr)
+{
+        LLSD agents;
+        cache_t::const_iterator it = sCache.begin();
+        for ( ; it != sCache.end(); ++it)
+        {
+                const LLUUID& agent_id = it->first;
+                const LLAvatarName& av_name = it->second;
+                if (!av_name.mIsDummy)
+                {
+                        // key must be a string
+                        agents[agent_id.asString()] = av_name.asLLSD();
+                }
+        }
+        LLSD data;
+        data["agents"] = agents;
+        LLSDSerialize::toPrettyXML(data, ostr);
+}
+
+void LLAvatarNameCache::setNameLookupURL(const std::string& name_lookup_url)
+{
+        sNameLookupURL = name_lookup_url;
+}
+
+bool LLAvatarNameCache::hasNameLookupURL()
+{
+        return !sNameLookupURL.empty();
+}
+
+void LLAvatarNameCache::idle()
+{
+        // By convention, start running at first idle() call
+        sRunning = true;
+
+        // *TODO: Possibly re-enabled this based on People API load measurements
+        // 100 ms is the threshold for "user speed" operations, so we can
+        // stall for about that long to batch up requests.
+        //const F32 SECS_BETWEEN_REQUESTS = 0.1f;
+        //if (!sRequestTimer.checkExpirationAndReset(SECS_BETWEEN_REQUESTS))
+        //{
+        //      return;
+        //}
+
+        // Must be large relative to above
+
+        // No longer deleting expired entries, just re-requesting in the get
+        // this way first synchronous get call on an expired entry won't return
+        // legacy name.  LF
+
+        //const F32 ERASE_EXPIRED_TIMEOUT = 60.f; // seconds
+        //if (sEraseExpiredTimer.checkExpirationAndReset(ERASE_EXPIRED_TIMEOUT))
+        //{
+        //      eraseExpired();
+        //}
+
+        if (sAskQueue.empty())
+        {
+                return;
+        }
+
+        if (useDisplayNames())
+        {
+                requestNamesViaCapability();
+        }
+        else
+        {
+                // ...fall back to legacy name cache system
+                requestNamesViaLegacy();
+        }
+}
+
+bool LLAvatarNameCache::isRequestPending(const LLUUID& agent_id)
+{
+        const F64 PENDING_TIMEOUT_SECS = 5.0 * 60.0;
+        F64 now = LLFrameTimer::getTotalSeconds();
+        F64 expire_time = now - PENDING_TIMEOUT_SECS;
+
+        pending_queue_t::const_iterator it = sPendingQueue.find(agent_id);
+        if (it != sPendingQueue.end())
+        {
+                bool request_expired = (it->second < expire_time);
+                return !request_expired;
+        }
+        return false;
+}
+
+void LLAvatarNameCache::eraseExpired()
+{
+        F64 now = LLFrameTimer::getTotalSeconds();
+        cache_t::iterator it = sCache.begin();
+        while (it != sCache.end())
+        {
+                cache_t::iterator cur = it;
+                ++it;
+                const LLAvatarName& av_name = cur->second;
+                if (av_name.mExpires < now)
+                {
+                        sCache.erase(cur);
+                }
+        }
+}
+
+void LLAvatarNameCache::buildLegacyName(const std::string& full_name,
+                                                                                LLAvatarName* av_name)
+{
+        llassert(av_name);
+        av_name->mUsername = "";
+        av_name->mDisplayName = full_name;
+        av_name->mIsDisplayNameDefault = true;
+        av_name->mIsDummy = true;
+        av_name->mExpires = F64_MAX;
+}
+
+// fills in av_name if it has it in the cache, even if expired (can check expiry time)
+// returns bool specifying  if av_name was filled, false otherwise
+bool LLAvatarNameCache::get(const LLUUID& agent_id, LLAvatarName *av_name)
+{
+        if (sRunning)
+        {
+                // ...only do immediate lookups when cache is running
+                if (useDisplayNames())
+                {
+                        // ...use display names cache
+                        std::map<LLUUID,LLAvatarName>::iterator it = sCache.find(agent_id);
+                        if (it != sCache.end())
+                        {
+                                *av_name = it->second;
+
+                                // re-request name if entry is expired
+                                if (av_name->mExpires < LLFrameTimer::getTotalSeconds())
+                                {
+                                        if (!isRequestPending(agent_id))
+                                        {
+                                                sAskQueue.insert(agent_id);
+                                        }
+                                }
+                                
+                                return true;
+                        }
+                }
+                else
+                {
+                        // ...use legacy names cache
+                        std::string full_name;
+                        if (gCacheName->getFullName(agent_id, full_name))
+                        {
+                                buildLegacyName(full_name, av_name);
+                                return true;
+                        }
+                }
+        }
+
+        if (!isRequestPending(agent_id))
+        {
+                sAskQueue.insert(agent_id);
+        }
+
+        return false;
+}
+
+void LLAvatarNameCache::fireSignal(const LLUUID& agent_id,
+                                                                   const callback_slot_t& slot,
+                                                                   const LLAvatarName& av_name)
+{
+        callback_signal_t signal;
+        signal.connect(slot);
+        signal(agent_id, av_name);
+}
+
+void LLAvatarNameCache::get(const LLUUID& agent_id, callback_slot_t slot)
+{
+        if (sRunning)
+        {
+                // ...only do immediate lookups when cache is running
+                if (useDisplayNames())
+                {
+                        // ...use new cache
+                        std::map<LLUUID,LLAvatarName>::iterator it = sCache.find(agent_id);
+                        if (it != sCache.end())
+                        {
+                                const LLAvatarName& av_name = it->second;
+                                
+                                if (av_name.mExpires > LLFrameTimer::getTotalSeconds())
+                                {
+                                        // ...name already exists in cache, fire callback now
+                                        fireSignal(agent_id, slot, av_name);
+
+                                        return;
+                                }
+                        }
+                }
+                else
+                {
+                        // ...use old name system
+                        std::string full_name;
+                        if (gCacheName->getFullName(agent_id, full_name))
+                        {
+                                LLAvatarName av_name;
+                                buildLegacyName(full_name, &av_name);
+                                fireSignal(agent_id, slot, av_name);
+                                return;
+                        }
+                }
+        }
+
+        // schedule a request
+        if (!isRequestPending(agent_id))
+        {
+                sAskQueue.insert(agent_id);
+        }
+
+        // always store additional callback, even if request is pending
+        signal_map_t::iterator sig_it = sSignalMap.find(agent_id);
+        if (sig_it == sSignalMap.end())
+        {
+                // ...new callback for this id
+                callback_signal_t* signal = new callback_signal_t();
+                signal->connect(slot);
+                sSignalMap[agent_id] = signal;
+        }
+        else
+        {
+                // ...existing callback, bind additional slot
+                callback_signal_t* signal = sig_it->second;
+                signal->connect(slot);
+        }
+}
+
+
+void LLAvatarNameCache::setUseDisplayNames(U32 use)
+{
+        if (use != sUseDisplayNames)
+        {
+                if (use > 2)
+                {
+                        sUseDisplayNames = 2;
+                }
+                else
+                {
+                        sUseDisplayNames = use;
+                }
+                // flush our cache
+                sCache.clear();
+
+                mUseDisplayNamesSignal();
+        }
+}
+
+U32 LLAvatarNameCache::useDisplayNames()
+{
+        // Must be both manually set on and able to look up names.
+        if (sNameLookupURL.empty())
+        {
+                return 0;
+        }
+        else
+        {
+                return sUseDisplayNames;
+        }
+}
+
+void LLAvatarNameCache::erase(const LLUUID& agent_id)
+{
+        sCache.erase(agent_id);
+}
+
+void LLAvatarNameCache::fetch(const LLUUID& agent_id)
+{
+        // re-request, even if request is already pending
+        sAskQueue.insert(agent_id);
+}
+
+void LLAvatarNameCache::insert(const LLUUID& agent_id, const LLAvatarName& av_name)
+{
+        // *TODO: update timestamp if zero?
+        sCache[agent_id] = av_name;
+}
+
+F64 LLAvatarNameCache::nameExpirationFromHeaders(LLSD headers)
+{
+        F64 expires = 0.0;
+        if (expirationFromCacheControl(headers, &expires))
+        {
+                return expires;
+        }
+        else
+        {
+                // With no expiration info, default to an hour
+                const F64 DEFAULT_EXPIRES = 60.0 * 60.0;
+                F64 now = LLFrameTimer::getTotalSeconds();
+                return now + DEFAULT_EXPIRES;
+        }
+}
+
+bool LLAvatarNameCache::expirationFromCacheControl(LLSD headers, F64 *expires)
+{
+        // Allow the header to override the default
+        LLSD cache_control_header = headers["cache-control"];
+        if (cache_control_header.isDefined())
+        {
+                S32 max_age = 0;
+                std::string cache_control = cache_control_header.asString();
+                if (max_age_from_cache_control(cache_control, &max_age))
+                {
+                        F64 now = LLFrameTimer::getTotalSeconds();
+                        *expires = now + (F64)max_age;
+                        return true;
+                }
+        }
+        return false;
+}
+
+
+void LLAvatarNameCache::addUseDisplayNamesCallback(const use_display_name_signal_t::slot_type& cb) 
+{ 
+        mUseDisplayNamesSignal.connect(cb); 
+}
+
+
+static const std::string MAX_AGE("max-age");
+static const boost::char_separator<char> EQUALS_SEPARATOR("=");
+static const boost::char_separator<char> COMMA_SEPARATOR(",");
+
+bool max_age_from_cache_control(const std::string& cache_control, S32 *max_age)
+{
+        // Split the string on "," to get a list of directives
+        typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+        tokenizer directives(cache_control, COMMA_SEPARATOR);
+
+        tokenizer::iterator token_it = directives.begin();
+        for ( ; token_it != directives.end(); ++token_it)
+        {
+                // Tokens may have leading or trailing whitespace
+                std::string token = *token_it;
+                LLStringUtil::trim(token);
+
+                if (token.compare(0, MAX_AGE.size(), MAX_AGE) == 0)
+                {
+                        // ...this token starts with max-age, so let's chop it up by "="
+                        tokenizer subtokens(token, EQUALS_SEPARATOR);
+                        tokenizer::iterator subtoken_it = subtokens.begin();
+
+                        // Must have a token
+                        if (subtoken_it == subtokens.end()) return false;
+                        std::string subtoken = *subtoken_it;
+
+                        // Must exactly equal "max-age"
+                        LLStringUtil::trim(subtoken);
+                        if (subtoken != MAX_AGE) return false;
+
+                        // Must have another token
+                        ++subtoken_it;
+                        if (subtoken_it == subtokens.end()) return false;
+                        subtoken = *subtoken_it;
+
+                        // Must be a valid integer
+                        // *NOTE: atoi() returns 0 for invalid values, so we have to
+                        // check the string first.
+                        // *TODO: Do servers ever send "0000" for zero?  We don't handle it
+                        LLStringUtil::trim(subtoken);
+                        if (subtoken == "0")
+                        {
+                                *max_age = 0;
+                                return true;
+                        }
+                        S32 val = atoi( subtoken.c_str() );
+                        if (val > 0 && val < S32_MAX)
+                        {
+                                *max_age = val;
+                                return true;
+                        }
+                        return false;
+                }
+        }
+        return false;
+}
+
diff --git a/linden/indra/llmessage/llavatarnamecache.h b/linden/indra/llmessage/llavatarnamecache.h
new file mode 100644
index 0000000..a2519cd
--- /dev/null
+++ b/linden/indra/llmessage/llavatarnamecache.h
@@ -0,0 +1,105 @@
+/** 
+ * @file llavatarnamecache.h
+ * @brief Provides lookup of avatar SLIDs ("bobsmith123") and display names
+ * ("James Cook") from avatar UUIDs.
+ *
+ * $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 LLAVATARNAMECACHE_H
+#define LLAVATARNAMECACHE_H
+
+#include "llavatarname.h"       // for convenience
+
+#include <boost/signals2.hpp>
+
+// We have display names support (this is for use by patches)
+#define LL_DISPLAY_NAMES
+
+class LLSD;
+class LLUUID;
+
+namespace LLAvatarNameCache
+{
+                
+        typedef boost::signals2::signal<void (void)> use_display_name_signal_t;
+
+        // Until the cache is set running, immediate lookups will fail and
+        // async lookups will be queued.  This allows us to block requests
+        // until we know if the first region supports display names.
+        void initClass(bool running);
+        void cleanupClass();
+
+        void importFile(std::istream& istr);
+        void exportFile(std::ostream& ostr);
+
+        // On the viewer, usually a simulator capabilitity
+        // If empty, name cache will fall back to using legacy name
+        // lookup system
+        void setNameLookupURL(const std::string& name_lookup_url);
+
+        // Do we have a valid lookup URL, hence are we trying to use the
+        // new display name lookup system?
+        bool hasNameLookupURL();
+        
+        // Periodically makes a batch request for display names not already in
+        // cache.  Call once per frame.
+        void idle();
+
+        // If name is in cache, returns true and fills in provided LLAvatarName
+        // otherwise returns false
+        bool get(const LLUUID& agent_id, LLAvatarName *av_name);
+
+        // Callback types for get() below
+        typedef boost::signals2::signal<
+                void (const LLUUID& agent_id, const LLAvatarName& av_name)>
+                        callback_signal_t;
+        typedef callback_signal_t::slot_type callback_slot_t;
+
+        // Fetches name information and calls callback.
+        // If name information is in cache, callback will be called immediately.
+        void get(const LLUUID& agent_id, callback_slot_t slot);
+
+        void setUseDisplayNames(U32 use);
+        U32 useDisplayNames();
+
+        void erase(const LLUUID& agent_id);
+
+        // Force a re-fetch of the most recent data, but keep the current
+        // data in cache
+        void fetch(const LLUUID& agent_id);
+
+        void insert(const LLUUID& agent_id, const LLAvatarName& av_name);
+
+        // Compute name expiration time from HTTP Cache-Control header,
+        // or return default value, in seconds from epoch.
+        F64 nameExpirationFromHeaders(LLSD headers);
+
+        void addUseDisplayNamesCallback(const use_display_name_signal_t::slot_type& cb);
+}
+
+// Parse a cache-control header to get the max-age delta-seconds.
+// Returns true if header has max-age param and it parses correctly.
+// Exported here to ease unit testing.
+bool max_age_from_cache_control(const std::string& cache_control, S32 *max_age);
+
+#endif
diff --git a/linden/indra/llmessage/llcachename.h b/linden/indra/llmessage/llcachename.h
index 2757b86..cb3cc1f 100644
--- a/linden/indra/llmessage/llcachename.h
+++ b/linden/indra/llmessage/llcachename.h
@@ -33,6 +33,8 @@
 #ifndef LL_LLCACHENAME_H
 #define LL_LLCACHENAME_H
 
+#include "llavatarnamecache.h"  // for convenience
+
 class LLMessageSystem;
 class LLHost;
 class LLUUID;
diff --git a/linden/indra/llmessage/llpartdata.cpp b/linden/indra/llmessage/llpartdata.cpp
index 485bc6a..a2811ab 100644
--- a/linden/indra/llmessage/llpartdata.cpp
+++ b/linden/indra/llmessage/llpartdata.cpp
@@ -347,3 +347,93 @@ void LLPartSysData::setPartAccel(const LLVector3 &accel)
         mPartAccel.mV[VY] = llclamp(accel.mV[VY], -100.f, 100.f);
         mPartAccel.mV[VZ] = llclamp(accel.mV[VZ], -100.f, 100.f);
 }
+
+LLSD LLPartSysData::asLLSD() const
+{
+        LLSD sd = LLSD();
+
+        sd["LL_PART_INTERP_COLOR_MASK"]         = (LLPartData::LL_PART_INTERP_COLOR_MASK  & mPartData.mFlags) ? 1 : 0;
+        sd["LL_PART_INTERP_SCALE_MASK"]         = (LLPartData::LL_PART_INTERP_SCALE_MASK  & mPartData.mFlags) ? 1 : 0;
+        sd["LL_PART_BOUNCE_MASK"]               = (LLPartData::LL_PART_BOUNCE_MASK  & mPartData.mFlags) ? 1 : 0;
+        sd["LL_PART_WIND_MASK"]                 = (LLPartData::LL_PART_WIND_MASK  & mPartData.mFlags) ? 1 : 0;
+        sd["LL_PART_FOLLOW_SRC_MASK"]           = (LLPartData::LL_PART_FOLLOW_SRC_MASK  & mPartData.mFlags) ? 1 : 0;
+        sd["LL_PART_FOLLOW_VELOCITY_MASK"]      = (LLPartData::LL_PART_FOLLOW_VELOCITY_MASK  & mPartData.mFlags) ? 1 : 0;
+        sd["LL_PART_TARGET_POS_MASK"]           = (LLPartData::LL_PART_TARGET_POS_MASK  & mPartData.mFlags) ? 1 : 0;
+        sd["LL_PART_TARGET_LINEAR_MASK"]        = (LLPartData::LL_PART_TARGET_LINEAR_MASK  & mPartData.mFlags) ? 1 : 0;
+        sd["LL_PART_EMISSIVE_MASK"]             = (LLPartData::LL_PART_EMISSIVE_MASK  & mPartData.mFlags) ? 1 : 0;
+        sd["LL_PART_BEAM_MASK"]                 = (LLPartData::LL_PART_BEAM_MASK  & mPartData.mFlags) ? 1 : 0;
+
+        sd["SourceMaxage"] = mPartData.mMaxAge;
+        sd["Startcolor"] = ll_sd_from_color4(mPartData.mStartColor);
+        sd["Endcolor"] = ll_sd_from_color4(mPartData.mEndColor);
+        sd["Startscale"] = ll_sd_from_vector2(mPartData.mStartScale);
+        sd["Endscale"] = ll_sd_from_vector2(mPartData.mEndScale);
+
+        sd["ParticleMaxAge"] = mMaxAge;
+        sd["ParticleStartAge"] = mStartAge;
+
+
+        sd["LL_PART_SRC_PATTERN_DROP"] = ( mPattern & LL_PART_SRC_PATTERN_DROP) ? 1 : 0;
+        sd["LL_PART_SRC_PATTERN_EXPLODE"] = ( mPattern & LL_PART_SRC_PATTERN_EXPLODE) ? 1 : 0;
+        sd["LL_PART_SRC_PATTERN_ANGLE"] = ( mPattern & LL_PART_SRC_PATTERN_ANGLE) ? 1 : 0;
+        sd["LL_PART_SRC_PATTERN_ANGLE_CONE"] = ( mPattern & LL_PART_SRC_PATTERN_ANGLE_CONE) ? 1 : 0 ;
+        sd["LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY"] = ( mPattern & LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY) ? 1 : 0;
+
+        sd["InnerAngle"] = mInnerAngle;
+        sd["OuterAngle"] = mOuterAngle;
+        sd["AngularVelocity"] = ll_sd_from_vector3(mAngularVelocity);
+        sd["BurstRate"] = mBurstRate;
+        sd["BurstPartCount"] = mBurstPartCount;
+        sd["BurstSpeedMin"] = mBurstSpeedMin;
+        sd["BurstSpeedMax"] = mBurstSpeedMax;
+        sd["BurstRadius"] = mBurstRadius;
+        sd["PartImageID"] = mPartImageID.asString();
+        sd["TargetId"]  = mTargetUUID.asString();
+        return sd;
+}
+
+bool LLPartSysData::fromLLSD(LLSD& sd)
+{
+        mPartData.mFlags = 0;
+        if (sd["LL_PART_INTERP_COLOR_MASK"])    mPartData.mFlags |=  LLPartData::LL_PART_INTERP_COLOR_MASK;
+        if (sd["LL_PART_INTERP_SCALE_MASK"])    mPartData.mFlags |=  LLPartData::LL_PART_INTERP_SCALE_MASK;
+        if (sd["LL_PART_BOUNCE_MASK"])          mPartData.mFlags |= LLPartData::LL_PART_BOUNCE_MASK;
+        if (sd["LL_PART_WIND_MASK"])            mPartData.mFlags |= LLPartData::LL_PART_WIND_MASK;
+        if (sd["LL_PART_FOLLOW_SRC_MASK"])      mPartData.mFlags |= LLPartData::LL_PART_FOLLOW_SRC_MASK;
+        if (sd["LL_PART_FOLLOW_VELOCITY_MASK"]) mPartData.mFlags |= LLPartData::LL_PART_FOLLOW_VELOCITY_MASK;
+        if (sd["LL_PART_TARGET_POS_MASK"])      mPartData.mFlags |= LLPartData::LL_PART_TARGET_POS_MASK;
+        if (sd["LL_PART_TARGET_LINEAR_MASK"])   mPartData.mFlags |= LLPartData::LL_PART_TARGET_LINEAR_MASK;
+        if (sd["LL_PART_EMISSIVE_MASK"])        mPartData.mFlags |= LLPartData::LL_PART_EMISSIVE_MASK;
+        if (sd["LL_PART_BEAM_MASK"])            mPartData.mFlags |= LLPartData::LL_PART_BEAM_MASK;
+
+        mPartData.mMaxAge = (F32)sd["SourceMaxage"].asReal();
+        mPartData.mStartColor = ll_color4_from_sd(sd["Startcolor"]);
+        mPartData.mEndColor = ll_color4_from_sd(sd["Endcolor"]);
+        mPartData.mStartScale = ll_vector2_from_sd(sd["Startscale"]);
+        mPartData.mEndScale = ll_vector2_from_sd(sd["Endscale"]);
+
+        mMaxAge         = (F32)sd["ParticleMaxAge"].asReal();
+        mStartAge       = (F32)sd["ParticleStartAge"].asReal();
+
+        mPattern = 0;
+        if (sd["LL_PART_SRC_PATTERN_DROP"])             mPattern |= LL_PART_SRC_PATTERN_DROP;
+        if (sd["LL_PART_SRC_PATTERN_EXPLODE"])          mPattern |= LL_PART_SRC_PATTERN_EXPLODE; 
+        if (sd["LL_PART_SRC_PATTERN_ANGLE"])            mPattern |= LL_PART_SRC_PATTERN_ANGLE;
+        if (sd["LL_PART_SRC_PATTERN_ANGLE_CONE"])       mPattern |= LL_PART_SRC_PATTERN_ANGLE_CONE;
+        if (sd["LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY"]) mPattern |= LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY;
+
+        mInnerAngle             = (F32)sd["InnerAngle"].asReal();
+        mOuterAngle             = (F32)sd["OuterAngle"].asReal();
+        mAngularVelocity        = ll_vector3_from_sd(sd["AngularVelocity"]);
+        mBurstRate              = (F32)sd["BurstRate"].asReal();
+        int burst_part_count    = sd["BurstPartCount"];
+        mBurstPartCount         = (U8)burst_part_count;
+        mBurstSpeedMin          = (F32)sd["BurstSpeedMin"].asReal();
+        mBurstSpeedMax          = (F32)sd["BurstSpeedMax"].asReal();
+        mBurstRadius            = (F32)sd["BurstRadius"].asReal();
+
+        mPartImageID    = LLUUID(sd[("PartImageID")].asString());
+        mTargetUUID     = LLUUID(sd["TargetId"].asString());
+
+        return true;
+}
\ No newline at end of file
diff --git a/linden/indra/llmessage/llpartdata.h b/linden/indra/llmessage/llpartdata.h
index 6dcb311..b7efa95 100644
--- a/linden/indra/llmessage/llpartdata.h
+++ b/linden/indra/llmessage/llpartdata.h
@@ -158,6 +158,9 @@ public:
         BOOL unpackBlock(const S32 block_num);
         BOOL packBlock();
 
+        LLSD asLLSD() const;
+        bool fromLLSD(LLSD& sd);
+
         static BOOL packNull();
         static BOOL isNullPS(const S32 block_num); // Returns FALSE if this is a "NULL" particle system (i.e. no system)
 
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index e6c1767..0eb5b41 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
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/settings.xml b/linden/indra/newview/app_settings/settings.xml
index c946f40..7ab3612 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..9a0295e 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"
@@ -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 sai;
-                gAudiop->setStreamingAudioImpl(NULL);
+                delete gAudioStream;
+                gAudioStream = 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_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
-                                                             "Imprudence.log");
-        LLFile::rename(log_file, old_log_file);
+        std::string log_name = "Imprudence.log";
 
-        // 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);
-                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)
+                if(!gDisconnected && gHippoGridManager->getConnectedGrid()->isSecondLife())
                 {
-                        llinfos << "Transmitting sessions stats" << llendl;
-                        send_stats();
-                        viewer_stats_timer.reset();
-                } */
+                        static LLFrameStatsTimer viewer_stats_timer(SEND_STATS_PERIOD);
+                        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 )
+                        {
+                                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/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/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 std::string& last,
-                                                                                                 BOOL is_group,
-                                                                                                 void* data)
+                                                                                                 const LLAvatarName& avatar_name)
 {
         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,
-                const std::string& first, const std::string& last, BOOL is_group, void* data);
+        static void callbackLoadAvatarName(const LLUUID& agent_id, const LLAvatarName& avatar_name);
         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 ?
-                                                                                 "inv_item_clothing.tga" :
-                                                                                 "inv_item_skin.tga" );
+        std::string icon_name = get_item_icon_name(asset_type, LLInventoryType::IT_WEARABLE, mType, FALSE);
         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;
-        gCacheName->getName(uuid, first, last);
-        LLUIString fullname = sNameFormat;
-        fullname.setArg("[FIRST]", first);
-        fullname.setArg("[LAST]", last);
+        std::string fullname;
+        gCacheName->getFullName(uuid, fullname);
 
         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/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());
-//awfixme                                       sTitleObserver.init(parcel->getMusicURL());
+                                        gAudioStream->startInternetStream(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/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...
-                                //                              mNeedsUpload = FALSE;//     ...below...
+                                //mUploadPending = FALSE;//see...
+                                //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
-                                                        //TODO: find out if SL is happy if we do
+                                readBackAndUpload();   //... here: Opensim is not happy if we don't
+                                //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/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;
-                return;
+                LLVector3d lpos_global = gAgent.getCameraPositionGlobal();
+                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();
-        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"))
+        else
         {
-                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")));
+                llwarns << "Failed to create an appropriate Audio Engine" << llendl;
+                return;
         }
-
         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_streamingaudio.cpp b/linden/indra/newview/llviewermedia_streamingaudio.cpp
index 575dbc8..4bbc519 100644
--- a/linden/indra/newview/llviewermedia_streamingaudio.cpp
+++ b/linden/indra/newview/llviewermedia_streamingaudio.cpp
@@ -69,6 +69,8 @@ void LLStreamingAudio_MediaPlugins::start(const std::string& url)
                 llinfos << "mMediaPlugin is now " << mMediaPlugin << llendl;
         }
 
+        mVersion = mMediaPlugin ? mMediaPlugin->getPluginVersion() : std::string();
+
         if(!mMediaPlugin)
                 return;
         
@@ -156,6 +158,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/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;
-
-                        // 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());
+                        setParticleSource(sCloud, 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;
-                for (iter = sAvatarXmlInfo->mDriverInfoList.begin();
-                         iter != sAvatarXmlInfo->mDriverInfoList.end(); iter++)
+                LLDriverParamInfo *info = *iter;
+                LLDriverParam* driver_param = new LLDriverParam( this );
+                if (driver_param->setInfo(info))
                 {
-                        LLDriverParamInfo *info = *iter;
-                        LLDriverParam* driver_param = new LLDriverParam( this );
-                        if (driver_param->setInfo(info))
-                        {
-                                addVisualParam( driver_param );
-                        }
-                        else
-                        {
-                                delete driver_param;
-                                llwarns << "avatar file: driver_param->parseData() failed" << llendl;
-                                return FALSE;
-                        }
+                        addVisualParam( driver_param );
+                }
+                else
+                {
+                        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();
-                }
-                if( param )
-                {
-                        llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file." << llendl;
-                        return;
+                        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 (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) &&
-                                (viewer_param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE) )
+                        if (viewer_param->getWearableType() == type && viewer_param->isTweakable())
                         {
                                 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/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..f737a7e 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">
@@ -1965,6 +1970,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/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index b8f3fcb..d02f1b3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -5237,6 +5237,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">
@@ -6874,7 +6956,7 @@ GRAVITY  --  -9.8
 
 *  --  Multiplication
 \  --  Division
-+  --  Addition
+  --  Addition
 -  --  Subtraction
 
 For information about this feature, click "More Info".
@@ -6903,7 +6985,7 @@ GLOW --  Glow
 
 *  --  Multiplication
 \  --  Division
-+  --  Addition
+  --  Addition
 -  --  Subtraction
 
 For information about this feature, click "More Info".
@@ -7221,6 +7303,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"
-                   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"
+  <spinner bottom_delta="-24" 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"
-             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"
+             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="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"
-             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"
+        <combo_box allow_text_entry="false" bottom_delta="0" 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>