114 files changed, 3964 insertions, 1020 deletions

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index a1c8624..2acb043 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -21,6 +21,7 @@ Aimee Trescothick
         VWR-8341
         VWR-8430
         VWR-9255
+        VWR-12748
 Alejandro Rosenthal
         VWR-1184
 Alissa Sabre
diff --git a/linden/indra/cmake/Python.cmake b/linden/indra/cmake/Python.cmake
index 4f86d32..0901c1b 100644
--- a/linden/indra/cmake/Python.cmake
+++ b/linden/indra/cmake/Python.cmake
@@ -13,6 +13,10 @@ if (WINDOWS)
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
+    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
+    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
+    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
+    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
     )
 elseif (EXISTS /etc/debian_version)
   # On Debian and Ubuntu, avoid Python 2.4 if possible.
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index bd8f080..207a48b 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -469,8 +469,15 @@ class WindowsSetup(PlatformSetup):
                     print 'Building with ', self.gens[version]['gen']
                     break
             else:
-                print >> sys.stderr, 'Cannot find a Visual Studio installation!'
-                eys.exit(1)
+                print >> sys.stderr, 'Cannot find a Visual Studio installation, testing for express editions'
+                for version in 'vc80 vc90 vc71'.split():
+                    if self.find_visual_studio_express(version):
+                        self._generator = version
+                        print 'Building with ', self.gens[version]['gen'] , "Express edition"
+                        break
+                else:
+                    print >> sys.stderr, 'Cannot find any Visual Studio installation'
+                    eys.exit(1)
         return self._generator
 
     def _set_generator(self, gen):
@@ -523,6 +530,28 @@ class WindowsSetup(PlatformSetup):
             print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
             return ''
 
+    def find_visual_studio_express(self, gen=None):
+        if gen is None:
+            gen = self._generator
+        gen = gen.lower()
+        try:
+            import _winreg
+            key_str = (r'SOFTWARE\Microsoft\VCEXpress\%s\Setup\VC' %
+                       self.gens[gen]['ver'])
+            value_str = (r'ProductDir')
+            print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' %
+                   (key_str, value_str))
+            print key_str
+
+            reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
+            key = _winreg.OpenKey(reg, key_str)
+            value = _winreg.QueryValueEx(key, value_str)[0]+"IDE"
+            print 'Found: %s' % value
+            return value
+        except WindowsError, err:
+            print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
+            return ''
+
     def get_build_cmd(self):
         if self.incredibuild:
             config = self.build_type
@@ -530,10 +559,23 @@ class WindowsSetup(PlatformSetup):
                 config = '\"%s|Win32\"' % config
 
             return "buildconsole %s.sln /build %s" % (self.project_name, config)
+           
+        environment = self.find_visual_studio()
+        if environment == '':
+            environment = self.find_visual_studio_express()
+            if environment == '':
+                 print >> sys.stderr, "Something went very wrong during build stage, could not find a Visual Studio?"
+            else:
+                 print >> sys.stderr, "\nSolution generation complete, as you are using an express edition the final\n stages will need to be completed by hand"
+                 build_dirs=self.build_dirs();
+                 print >> sys.stderr, "Solution can now be found in:", build_dirs[0]
+                 print >> sys.stderr, "Set %s as startup project" % self.project_name
+                 print >> sys.stderr, "Set build target is Release or RelWithDbgInfo"
+                 exit(0)   
 
         # devenv.com is CLI friendly, devenv.exe... not so much.
         return ('"%sdevenv.com" %s.sln /build %s' % 
-                (self.find_visual_studio(), self.project_name, self.build_type))
+               (environment, self.project_name, self.build_type))
 
     # this override of run exists because the PlatformSetup version
     # uses Unix/Mac only calls. Freakin' os module!
diff --git a/linden/indra/llaudio/audioengine.h b/linden/indra/llaudio/audioengine.h
index d289ba5..579f58f 100644
--- a/linden/indra/llaudio/audioengine.h
+++ b/linden/indra/llaudio/audioengine.h
@@ -182,6 +182,8 @@ public:
         static void assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 result_code, LLExtStat ext_status);
 
         friend class LLPipeline; // For debugging
+
+        LLMediaBase * getStreamMedia() { return mInternetStreamMedia; }
 public:
         F32 mMaxWindGain; // Hack.  Public to set before fade in?
 
diff --git a/linden/indra/llcommon/CMakeLists.txt b/linden/indra/llcommon/CMakeLists.txt
index 4001e1f..3f14be6 100644
--- a/linden/indra/llcommon/CMakeLists.txt
+++ b/linden/indra/llcommon/CMakeLists.txt
@@ -20,6 +20,7 @@ set(llcommon_SOURCE_FILES
     llcommon.cpp
     llcrc.cpp
     llcriticaldamp.cpp
+    llcursortypes.cpp
     lldate.cpp
     llerror.cpp
     llerrorthread.cpp
@@ -90,6 +91,7 @@ set(llcommon_HEADER_FILES
     llcommon.h
     llcrc.h
     llcriticaldamp.h
+    llcursortypes.h
     lldarray.h
     lldarrayptr.h
     lldate.h
diff --git a/linden/indra/llcommon/llchat.h b/linden/indra/llcommon/llchat.h
index aa4469c..6c75a25 100644
--- a/linden/indra/llcommon/llchat.h
+++ b/linden/indra/llcommon/llchat.h
@@ -81,9 +81,10 @@ public:
                 mAudible(CHAT_AUDIBLE_FULLY),
                 mMuted(FALSE),
                 mTime(0.0),
-                mPosAgent()
+                mPosAgent(),
+                mURL()
         { }
-        
+
         std::string             mText;          // UTF-8 line of text
         std::string             mFromName;      // agent or object name
         LLUUID                  mFromID;        // agent id or object id
@@ -97,6 +98,7 @@ public:
         BOOL                    mMuted;         // pass muted chat to maintain list of chatters
         F64                             mTime;          // viewer only, seconds from viewer start
         LLVector3               mPosAgent;
+        std::string             mURL;
 };
 
 #endif
diff --git a/linden/indra/llcommon/llcursortypes.cpp b/linden/indra/llcommon/llcursortypes.cpp
new file mode 100644
index 0000000..858414b
--- /dev/null
+++ b/linden/indra/llcommon/llcursortypes.cpp
@@ -0,0 +1,89 @@
+/**
+ * @file llcursortypes.cpp
+ * @brief Cursor types and lookup of types from a string
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llcursortypes.h"
+
+ECursorType getCursorFromString(const std::string& cursor_string)
+{
+        static std::map<std::string,U32> cursor_string_table;
+        if (cursor_string_table.empty())
+        {
+                cursor_string_table["UI_CURSOR_ARROW"] = UI_CURSOR_ARROW;
+                cursor_string_table["UI_CURSOR_WAIT"] = UI_CURSOR_WAIT;
+                cursor_string_table["UI_CURSOR_HAND"] = UI_CURSOR_HAND;
+                cursor_string_table["UI_CURSOR_IBEAM"] = UI_CURSOR_IBEAM;
+                cursor_string_table["UI_CURSOR_CROSS"] = UI_CURSOR_CROSS;
+                cursor_string_table["UI_CURSOR_SIZENWSE"] = UI_CURSOR_SIZENWSE;
+                cursor_string_table["UI_CURSOR_SIZENESW"] = UI_CURSOR_SIZENESW;
+                cursor_string_table["UI_CURSOR_SIZEWE"] = UI_CURSOR_SIZEWE;
+                cursor_string_table["UI_CURSOR_SIZENS"] = UI_CURSOR_SIZENS;
+                cursor_string_table["UI_CURSOR_NO"] = UI_CURSOR_NO;
+                cursor_string_table["UI_CURSOR_WORKING"] = UI_CURSOR_WORKING;
+                cursor_string_table["UI_CURSOR_TOOLGRAB"] = UI_CURSOR_TOOLGRAB;
+                cursor_string_table["UI_CURSOR_TOOLLAND"] = UI_CURSOR_TOOLLAND;
+                cursor_string_table["UI_CURSOR_TOOLFOCUS"] = UI_CURSOR_TOOLFOCUS;
+                cursor_string_table["UI_CURSOR_TOOLCREATE"] = UI_CURSOR_TOOLCREATE;
+                cursor_string_table["UI_CURSOR_ARROWDRAG"] = UI_CURSOR_ARROWDRAG;
+                cursor_string_table["UI_CURSOR_ARROWCOPY"] = UI_CURSOR_ARROWCOPY;
+                cursor_string_table["UI_CURSOR_ARROWDRAGMULTI"] = UI_CURSOR_ARROWDRAGMULTI;
+                cursor_string_table["UI_CURSOR_ARROWCOPYMULTI"] = UI_CURSOR_ARROWCOPYMULTI;
+                cursor_string_table["UI_CURSOR_NOLOCKED"] = UI_CURSOR_NOLOCKED;
+                cursor_string_table["UI_CURSOR_ARROWLOCKED"] = UI_CURSOR_ARROWLOCKED;
+                cursor_string_table["UI_CURSOR_GRABLOCKED"] = UI_CURSOR_GRABLOCKED;
+                cursor_string_table["UI_CURSOR_TOOLTRANSLATE"] = UI_CURSOR_TOOLTRANSLATE;
+                cursor_string_table["UI_CURSOR_TOOLROTATE"] = UI_CURSOR_TOOLROTATE;
+                cursor_string_table["UI_CURSOR_TOOLSCALE"] = UI_CURSOR_TOOLSCALE;
+                cursor_string_table["UI_CURSOR_TOOLCAMERA"] = UI_CURSOR_TOOLCAMERA;
+                cursor_string_table["UI_CURSOR_TOOLPAN"] = UI_CURSOR_TOOLPAN;
+                cursor_string_table["UI_CURSOR_TOOLZOOMIN"] = UI_CURSOR_TOOLZOOMIN;
+                cursor_string_table["UI_CURSOR_TOOLPICKOBJECT3"] = UI_CURSOR_TOOLPICKOBJECT3;
+                cursor_string_table["UI_CURSOR_TOOLSIT"] = UI_CURSOR_TOOLSIT;
+                cursor_string_table["UI_CURSOR_TOOLBUY"] = UI_CURSOR_TOOLBUY;
+                cursor_string_table["UI_CURSOR_TOOLPAY"] = UI_CURSOR_TOOLPAY;
+                cursor_string_table["UI_CURSOR_TOOLOPEN"] = UI_CURSOR_TOOLOPEN;
+                cursor_string_table["UI_CURSOR_TOOLPLAY"] = UI_CURSOR_TOOLPLAY;
+                cursor_string_table["UI_CURSOR_TOOLPAUSE"] = UI_CURSOR_TOOLPAUSE;
+                cursor_string_table["UI_CURSOR_TOOLMEDIAOPEN"] = UI_CURSOR_TOOLMEDIAOPEN;
+                cursor_string_table["UI_CURSOR_PIPETTE"] = UI_CURSOR_PIPETTE;
+        }
+
+        std::map<std::string,U32>::const_iterator iter = cursor_string_table.find(cursor_string);
+
+        if (iter != cursor_string_table.end())
+        {
+                return (ECursorType)iter->second;
+        }
+
+        return UI_CURSOR_ARROW;
+}
+
+
+
diff --git a/linden/indra/llcommon/llcursortypes.h b/linden/indra/llcommon/llcursortypes.h
new file mode 100644
index 0000000..9be064f
--- /dev/null
+++ b/linden/indra/llcommon/llcursortypes.h
@@ -0,0 +1,81 @@
+/**
+ * @file llcursortypes.h
+ * @brief Cursor types
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLCURSORTYPES_H
+#define LL_LLCURSORTYPES_H
+
+#include "linden_common.h"
+
+// If you add types here, add them in LLCursor::getCursorFromString
+enum ECursorType {
+        UI_CURSOR_ARROW,
+        UI_CURSOR_WAIT,
+        UI_CURSOR_HAND,
+        UI_CURSOR_IBEAM,
+        UI_CURSOR_CROSS,
+        UI_CURSOR_SIZENWSE,
+        UI_CURSOR_SIZENESW,
+        UI_CURSOR_SIZEWE,
+        UI_CURSOR_SIZENS,
+        UI_CURSOR_NO,
+        UI_CURSOR_WORKING,
+        UI_CURSOR_TOOLGRAB,
+        UI_CURSOR_TOOLLAND,
+        UI_CURSOR_TOOLFOCUS,
+        UI_CURSOR_TOOLCREATE,
+        UI_CURSOR_ARROWDRAG,
+        UI_CURSOR_ARROWCOPY,    // drag with copy
+        UI_CURSOR_ARROWDRAGMULTI,
+        UI_CURSOR_ARROWCOPYMULTI,       // drag with copy
+        UI_CURSOR_NOLOCKED,
+        UI_CURSOR_ARROWLOCKED,
+        UI_CURSOR_GRABLOCKED,
+        UI_CURSOR_TOOLTRANSLATE,
+        UI_CURSOR_TOOLROTATE,
+        UI_CURSOR_TOOLSCALE,
+        UI_CURSOR_TOOLCAMERA,
+        UI_CURSOR_TOOLPAN,
+        UI_CURSOR_TOOLZOOMIN,
+        UI_CURSOR_TOOLPICKOBJECT3,
+        UI_CURSOR_TOOLSIT,
+        UI_CURSOR_TOOLBUY,
+        UI_CURSOR_TOOLPAY,
+        UI_CURSOR_TOOLOPEN,
+        UI_CURSOR_TOOLPLAY,
+        UI_CURSOR_TOOLPAUSE,
+        UI_CURSOR_TOOLMEDIAOPEN,
+        UI_CURSOR_PIPETTE,
+        UI_CURSOR_COUNT                 // Number of elements in this enum (NOT a cursor)
+};
+
+ECursorType getCursorFromString(const std::string& cursor_string);
+
+#endif // LL_LLCURSORTYPES_H
diff --git a/linden/indra/llmath/xform.h b/linden/indra/llmath/xform.h
index 6f880cb..b41219c 100644
--- a/linden/indra/llmath/xform.h
+++ b/linden/indra/llmath/xform.h
@@ -37,7 +37,7 @@
 
 const F32 MAX_OBJECT_Z          = 4096.f; // should match REGION_HEIGHT_METERS, Pre-havok4: 768.f
 const F32 MIN_OBJECT_Z          = -256.f;
-const F32 DEFAULT_MAX_PRIM_SCALE = 10.f;
+//const F32 DEFAULT_MAX_PRIM_SCALE = 10.f; set in llmanipscale.cpp now
 const F32 MIN_PRIM_SCALE = 0.01f;
 const F32 MAX_PRIM_SCALE = 65536.f;     // something very high but not near FLT_MAX
 
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index d1bab29..a9e0004 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -89,6 +89,7 @@ LLMediaImplGStreamer () :
         mPump ( NULL ),
         mPlaybin ( NULL ),
         mVideoSink ( NULL ),
+        mLastTitle ( "" ),
         mState( GST_STATE_NULL ),
         mPlayThread ( NULL )
 {
@@ -470,6 +471,8 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                         case GST_STATE_PAUSED:
                                 break;
                         case GST_STATE_PLAYING:
+                                //impl->mLastTitle = "";
+
                                 LLMediaEvent event( impl, 100 );
                                 impl->getEventEmitter().update( &LLMediaObserver::onUpdateProgress, event );
                                 // emit an event to say that a media source was loaded
@@ -521,18 +524,28 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                 }
                 case GST_MESSAGE_TAG: 
                 {
-                GstTagList *tag_list;
-                gchar *title;
-                gchar *artist;
-                gst_message_parse_tag(message, &tag_list);
-                gboolean hazTitle = gst_tag_list_get_string(tag_list,
-                        GST_TAG_TITLE, &title);
-                gboolean hazArtist = gst_tag_list_get_string(tag_list,
-                        GST_TAG_ARTIST, &artist);
-                if(hazTitle) 
-                        LL_INFOS("MediaInfo") << "Title: " << title << LL_ENDL;
-                if(hazArtist) 
-                        LL_INFOS("MediaInfo") << "Artist: " << artist << LL_ENDL;
+                        GstTagList *new_tags;
+
+                        gst_message_parse_tag( message, &new_tags );
+
+                        gchar *title;
+
+                        if ( gst_tag_list_get_string(new_tags, GST_TAG_TITLE, &title) )
+                        {
+                                LL_INFOS("MediaInfo") << "Title: " << title << LL_ENDL;
+                                std::string newtitle(title);
+                                gst_tag_list_free(new_tags);
+
+                                if ( newtitle != impl->mLastTitle && newtitle != "" )
+                                {
+                                        impl->mLastTitle = newtitle;
+                                        LLMediaEvent event( impl, impl->mLastTitle );
+                                        impl->getEventEmitter().update( &LLMediaObserver::onMediaTitleChange, event );
+                                }
+
+                                g_free(title);
+                        }
+
                         break;
                 }
                 case GST_MESSAGE_EOS:
@@ -551,10 +564,10 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                                 impl->addCommand(LLMediaBase::COMMAND_STOP);
                         }
                         break;
+                }
                 default:
                         /* unhandled message */
                         break;
-                }
         }
         /* we want to be notified again the next time there is a message
          * on the bus, so return true (false means we want to stop watching
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index baefdaf..51a8c37 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -127,6 +127,7 @@ class LLMediaImplGStreamer:
                 GMainLoop *mPump; // event pump for this media
                 GstElement *mPlaybin;
                 GstSLVideo *mVideoSink;
+                std::string mLastTitle;
                 GstState mState;
                 GstState getState() const { return mState; }
 
diff --git a/linden/indra/llmedia/llmediaobserver.h b/linden/indra/llmedia/llmediaobserver.h
index e6da4f6..97fed5f 100644
--- a/linden/indra/llmedia/llmediaobserver.h
+++ b/linden/indra/llmedia/llmediaobserver.h
@@ -102,6 +102,7 @@ class LLMediaObserver
                 virtual void onMediaSizeChange( const EventType& event_in ) { }
                 virtual void onMediaContentsChange( const EventType& event_in ) { }
                 virtual void onMediaStatusTextChange( const EventType& event_in ) { }
+                virtual void onMediaTitleChange( const EventType &event_in ) { }
                 virtual void onNavigateBegin( const EventType& event_in ) { }
                 virtual void onNavigateComplete( const EventType& event_in ) { }
                 virtual void onUpdateProgress( const EventType& event_in ) { }
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp
index d37517f..05103dc 100644
--- a/linden/indra/llui/llpanel.cpp
+++ b/linden/indra/llui/llpanel.cpp
@@ -982,12 +982,12 @@ void LLPanel::childSetAction(const std::string& id, void(*function)(void*), void
         }
 }
 
-void LLPanel::childSetActionTextbox(const std::string& id, void(*function)(void*))
+void LLPanel::childSetActionTextbox(const std::string& id, void(*function)(void*), void* value)
 {
         LLTextBox* textbox = getChild<LLTextBox>(id);
         if (textbox)
         {
-                textbox->setClickedCallback(function);
+                textbox->setClickedCallback(function, value);
         }
 }
 
diff --git a/linden/indra/llui/llpanel.h b/linden/indra/llui/llpanel.h
index 46022e5..8dea9b1 100644
--- a/linden/indra/llui/llpanel.h
+++ b/linden/indra/llui/llpanel.h
@@ -220,7 +220,7 @@ public:
 
         // LLButton
         void childSetAction(const std::string& id, void(*function)(void*), void* value);
-        void childSetActionTextbox(const std::string& id, void(*function)(void*));
+        void childSetActionTextbox(const std::string& id, void(*function)(void*), void* value = NULL);
         void childSetControlName(const std::string& id, const std::string& control_name);
 
         // Error reporting
diff --git a/linden/indra/llui/lltextbox.cpp b/linden/indra/llui/lltextbox.cpp
index f43b7d2..e45f97b 100644
--- a/linden/indra/llui/lltextbox.cpp
+++ b/linden/indra/llui/lltextbox.cpp
@@ -33,6 +33,7 @@
 #include "lltextbox.h"
 #include "lluictrlfactory.h"
 #include "llfocusmgr.h"
+#include "llwindow.h"
 
 static LLRegisterWidget<LLTextBox> r("text");
 
@@ -193,12 +194,14 @@ BOOL LLTextBox::handleMouseUp(S32 x, S32 y, MASK mask)
 
 BOOL LLTextBox::handleHover(S32 x, S32 y, MASK mask)
 {
+        BOOL handled = LLView::handleHover(x,y,mask);
         if(mHoverActive)
         {
                 mHasHover = TRUE; // This should be set every frame during a hover.
-                return TRUE;
+                getWindow()->setCursor(UI_CURSOR_ARROW);
         }
-        return LLView::handleHover(x,y,mask);
+
+        return (handled || mHasHover);
 }
 
 void LLTextBox::setText(const LLStringExplicit& text)
diff --git a/linden/indra/llui/lltextbox.h b/linden/indra/llui/lltextbox.h
index 83e4a9b..aac5344 100644
--- a/linden/indra/llui/lltextbox.h
+++ b/linden/indra/llui/lltextbox.h
@@ -88,8 +88,7 @@ public:
         void                    setVPad(S32 pixels)                                             { mVPad = pixels; }
         void                    setRightAlign()                                                 { mHAlign = LLFontGL::RIGHT; }
         void                    setHAlign( LLFontGL::HAlign align )             { mHAlign = align; }
-        void                    setClickedCallback( void (*cb)(void *data) ){ mClickedCallback = cb; }          // mouse down and up within button
-        void                    setCallbackUserData( void* data )               { mCallbackUserData = data; }
+        void                    setClickedCallback( void (*cb)(void *data), void* data = NULL ){ mClickedCallback = cb; mCallbackUserData = data; }             // mouse down and up within button
 
         const LLFontGL* getFont() const                                                 { return mFontGL; }
 
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 95cce60..8fa253a 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -3605,13 +3605,13 @@ void LLTextEditor::appendColoredText(const std::string &new_text,
         style->setVisible(true);
         style->setColor(color);
         style->setFontName(font_name);
-        appendStyledText(new_text, allow_undo, prepend_newline, &style);
+        appendStyledText(new_text, allow_undo, prepend_newline, style);
 }
 
 void LLTextEditor::appendStyledText(const std::string &new_text, 
-                                                                         bool allow_undo, 
+                                                                         bool allow_undo,
                                                                          bool prepend_newline,
-                                                                         const LLStyleSP *stylep)
+                                                                         const LLStyleSP stylep)
 {
         if(mParseHTML)
         {
@@ -3626,14 +3626,14 @@ void LLTextEditor::appendStyledText(const std::string &new_text,
                         html->setColor(mLinkColor);
                         if (stylep)
                         {
-                                html->setFontName((*stylep)->getFontString());
+                                html->setFontName(stylep->getFontString());
                         }
                         html->mUnderline = TRUE;
 
                         if (start > 0) appendText(text.substr(0,start),allow_undo, prepend_newline, stylep);
                         html->setLinkHREF(text.substr(start,end-start));
-                        appendText(text.substr(start, end-start),allow_undo, prepend_newline, &html);
-                        if (end < (S32)text.length()) 
+                        appendText(text.substr(start, end-start),allow_undo, prepend_newline, html);
+                        if (end < (S32)text.length())
                         {
                                 text = text.substr(end,text.length() - end);
                                 end=0;
@@ -3653,7 +3653,7 @@ void LLTextEditor::appendStyledText(const std::string &new_text,
 
 // Appends new text to end of document
 void LLTextEditor::appendText(const std::string &new_text, bool allow_undo, bool prepend_newline,
-                                                          const LLStyleSP *stylep)
+                                                          const LLStyleSP stylep)
 {
         // Save old state
         BOOL was_scrolled_to_bottom = (mScrollbar->getDocPos() == mScrollbar->getDocPosMax());
@@ -3685,7 +3685,7 @@ void LLTextEditor::appendText(const std::string &new_text, bool allow_undo, bool
         {
                 S32 segment_start = old_length;
                 S32 segment_end = getLength();
-                LLTextSegment* segment = new LLTextSegment(*stylep, segment_start, segment_end );
+                LLTextSegment* segment = new LLTextSegment(stylep, segment_start, segment_end );
                 mSegments.push_back(segment);
         }
         
diff --git a/linden/indra/llui/lltexteditor.h b/linden/indra/llui/lltexteditor.h
index 0777e5f..7e93de1 100644
--- a/linden/indra/llui/lltexteditor.h
+++ b/linden/indra/llui/lltexteditor.h
@@ -146,16 +146,16 @@ public:
         void                    insertText(const std::string &text);
         // appends text at end
         void                    appendText(const std::string &wtext, bool allow_undo, bool prepend_newline,
-                                                           const LLStyleSP *stylep = NULL);
+                                                           const LLStyleSP stylep = NULL);
 
-        void                    appendColoredText(const std::string &wtext, bool allow_undo, 
+        void                    appendColoredText(const std::string &wtext, bool allow_undo,
                                                                           bool prepend_newline,
                                                                           const LLColor4 &color,
                                                                           const std::string& font_name = LLStringUtil::null);
         // if styled text starts a line, you need to prepend a newline.
-        void                    appendStyledText(const std::string &new_text, bool allow_undo, 
+        void                    appendStyledText(const std::string &new_text, bool allow_undo,
                                                                          bool prepend_newline,
-                                                                         const LLStyleSP *stylep = NULL);
+                                                                         const LLStyleSP stylep = NULL);
 
         // Removes text from the end of document
         // Does not change highlight or cursor position.
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index 78bf168..e3652b7 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -85,7 +85,8 @@ LLView::LLView() :
         mLastVisible(TRUE),
         mUseBoundingRect(FALSE),
         mVisible(TRUE),
-        mNextInsertionOrdinal(0)
+        mNextInsertionOrdinal(0),
+        mHoverCursor(UI_CURSOR_ARROW)
 {
 }
 
@@ -102,7 +103,8 @@ LLView::LLView(const std::string& name, BOOL mouse_opaque) :
         mLastVisible(TRUE),
         mUseBoundingRect(FALSE),
         mVisible(TRUE),
-        mNextInsertionOrdinal(0)
+        mNextInsertionOrdinal(0),
+        mHoverCursor(UI_CURSOR_ARROW)
 {
 }
 
@@ -123,7 +125,8 @@ LLView::LLView(
         mLastVisible(TRUE),
         mUseBoundingRect(FALSE),
         mVisible(TRUE),
-        mNextInsertionOrdinal(0)
+        mNextInsertionOrdinal(0),
+        mHoverCursor(UI_CURSOR_ARROW)
 {
 }
 
@@ -657,7 +660,7 @@ BOOL LLView::handleHover(S32 x, S32 y, MASK mask)
         if( !handled 
                 && blockMouseEvent(x, y) )
         {
-                LLUI::sWindow->setCursor(UI_CURSOR_ARROW);
+                LLUI::sWindow->setCursor(mHoverCursor);
                 lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << llendl;
                 handled = TRUE;
         }
@@ -2622,7 +2625,14 @@ void LLView::initFromXML(LLXMLNodePtr node, LLView* parent)
                 node->getAttributeBOOL("visible", visible);
                 setVisible(visible);
         }
-        
+
+        if (node->hasAttribute("hover_cursor"))
+        {
+                std::string cursor_string;
+                node->getAttributeString("hover_cursor", cursor_string);
+                mHoverCursor = getCursorFromString(cursor_string);
+        }
+
         node->getAttributeBOOL("use_bounding_rect", mUseBoundingRect);
         node->getAttributeBOOL("mouse_opaque", mMouseOpaque);
 
diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h
index da7f164..df34a3e 100644
--- a/linden/indra/llui/llview.h
+++ b/linden/indra/llui/llview.h
@@ -51,6 +51,7 @@
 #include "llxmlnode.h"
 #include "stdenums.h"
 #include "lluistring.h"
+#include "llcursortypes.h"
 
 const U32       FOLLOWS_NONE    = 0x00;
 const U32       FOLLOWS_LEFT    = 0x01;
@@ -653,7 +654,9 @@ private:
         mutable dummy_widget_map_t mDummyWidgets;
 
         boost::signals::connection mControlConnection;
-        
+
+        ECursorType mHoverCursor;
+
 public:
         static BOOL     sDebugRects;    // Draw debug rects behind everything.
         static BOOL sDebugKeys;
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index 821de2f..0acbcb9 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -35,48 +35,7 @@
 #include "llrect.h"
 #include "llcoord.h"
 #include "llstring.h"
-
-
-enum ECursorType {
-        UI_CURSOR_ARROW,
-        UI_CURSOR_WAIT,
-        UI_CURSOR_HAND,
-        UI_CURSOR_IBEAM,
-        UI_CURSOR_CROSS,
-        UI_CURSOR_SIZENWSE,
-        UI_CURSOR_SIZENESW,
-        UI_CURSOR_SIZEWE,
-        UI_CURSOR_SIZENS,
-        UI_CURSOR_NO,
-        UI_CURSOR_WORKING,
-        UI_CURSOR_TOOLGRAB,
-        UI_CURSOR_TOOLLAND,
-        UI_CURSOR_TOOLFOCUS,
-        UI_CURSOR_TOOLCREATE,
-        UI_CURSOR_ARROWDRAG,
-        UI_CURSOR_ARROWCOPY,    // drag with copy
-        UI_CURSOR_ARROWDRAGMULTI,
-        UI_CURSOR_ARROWCOPYMULTI,       // drag with copy
-        UI_CURSOR_NOLOCKED,
-        UI_CURSOR_ARROWLOCKED,
-        UI_CURSOR_GRABLOCKED,
-        UI_CURSOR_TOOLTRANSLATE,
-        UI_CURSOR_TOOLROTATE,
-        UI_CURSOR_TOOLSCALE,
-        UI_CURSOR_TOOLCAMERA,
-        UI_CURSOR_TOOLPAN,
-        UI_CURSOR_TOOLZOOMIN,
-        UI_CURSOR_TOOLPICKOBJECT3,
-        UI_CURSOR_TOOLSIT,
-        UI_CURSOR_TOOLBUY,
-        UI_CURSOR_TOOLPAY,
-        UI_CURSOR_TOOLOPEN,
-        UI_CURSOR_TOOLPLAY,
-        UI_CURSOR_TOOLPAUSE,
-        UI_CURSOR_TOOLMEDIAOPEN,
-        UI_CURSOR_PIPETTE,
-        UI_CURSOR_COUNT                 // Number of elements in this enum (NOT a cursor)
-};
+#include "llcursortypes.h"
 
 class LLSplashScreen;
 
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index f224652..bb07922 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -168,6 +168,7 @@ set(viewer_SOURCE_FILES
     llfloatermute.cpp
     llfloaternamedesc.cpp
     llfloaternewim.cpp
+    llfloaterobjectiminfo.cpp
     llfloateropenobject.cpp
     llfloaterparcel.cpp
     llfloaterpermissionsmgr.cpp
@@ -422,6 +423,7 @@ set(viewer_SOURCE_FILES
     llwearablelist.cpp
     llweb.cpp
     llwebbrowserctrl.cpp
+    llwindlightremotectrl.cpp
     llwind.cpp
     llwlanimator.cpp
     llwldaycycle.cpp
@@ -571,6 +573,7 @@ set(viewer_HEADER_FILES
     llfloatermute.h
     llfloaternamedesc.h
     llfloaternewim.h
+    llfloaterobjectiminfo.h
     llfloateropenobject.h
     llfloaterparcel.h
     llfloaterpermissionsmgr.h
@@ -830,6 +833,7 @@ set(viewer_HEADER_FILES
     llwebbrowserctrl.h
     llwind.h
     llwindebug.h
+    llwindlightremotectrl.h
     llwlanimator.h
     llwldaycycle.h
     llwlparammanager.h
@@ -1097,6 +1101,7 @@ set(viewer_XUI_FILES
     skins/default/xui/en-us/floater_name_description.xml
     skins/default/xui/en-us/floater_new_im.xml
     skins/default/xui/en-us/floater_new_outfit_dialog.xml
+    skins/default/xui/en-us/floater_object_im_info.xml
     skins/default/xui/en-us/floater_openobject.xml
     skins/default/xui/en-us/floater_pay_object.xml
     skins/default/xui/en-us/floater_pay.xml
@@ -1213,6 +1218,9 @@ set(viewer_XUI_FILES
     skins/default/xui/en-us/panel_voice_options.xml
     skins/default/xui/en-us/panel_voice_remote_expanded.xml
     skins/default/xui/en-us/panel_voice_remote.xml
+    skins/default/xui/en-us/panel_windlight_controls.xml
+    skins/default/xui/en-us/panel_windlight_remote.xml
+    skins/default/xui/en-us/panel_windlight_remote_expanded.xml
     skins/default/xui/en-us/role_actions.xml
     skins/default/xui/en-us/strings.xml
     skins/default/xui/en-us/teleport_strings.xml
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 154fd5f..194e95e 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -763,6 +763,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>BlockClickSit</key>
+    <map>
+      <key>Comment</key>
+      <string>Block click sit</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>BrowserHome</key>
     <map>
       <key>Comment</key>
@@ -2492,6 +2503,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>EnableWindlightRemote</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable windlight quick access remote in toolbar</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>EnergyFromTop</key>
     <map>
       <key>Comment</key>
@@ -3205,7 +3227,24 @@
         <integer>0</integer>
       </array>
     </map>
-    <key>FloaterOpenObjectRect</key>
+
+  <key>FloaterObjectIMInfo</key>
+  <map>
+    <key>Comment</key>
+    <string>Rectangle for floater object im info windows</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Rect</string>
+    <key>Value</key>
+    <array>
+      <integer>0</integer>
+      <integer>300</integer>
+      <integer>300</integer>
+      <integer>0</integer>
+    </array>
+  </map>
+  <key>FloaterOpenObjectRect</key>
     <map>
       <key>Comment</key>
       <string>Rectangle for Open Object window</string>
@@ -4136,6 +4175,17 @@
       <key>Value</key>
       <real>1.0</real>
     </map>
+    <key>InventorySearchType</key>
+    <map>
+      <key>Comment</key>
+      <string>Controls what type of inventory search we perform.</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>InventorySortOrder</key>
     <map>
       <key>Comment</key>
@@ -4670,6 +4720,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LoggedIntoOpenSim</key>
+    <map>
+      <key>Comment</key>
+      <string>Check whether or not we're in an OpenSimulator (default 0)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>LoginAsGod</key>
     <map>
       <key>Comment</key>
@@ -4747,6 +4808,17 @@
       <key>Value</key>
       <real>128.0</real>
     </map>
+    <key>MapShowAgentCount</key>
+    <map>
+      <key>Comment</key>
+      <string>Show number of agents next to region names on world map</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>MapShowEvents</key>
     <map>
       <key>Comment</key>
@@ -4992,7 +5064,7 @@
     <key>MiniMapScale</key>
     <map>
       <key>Comment</key>
-      <string>Miniature world map zoom levle (pixels per region)</string>
+      <string>Miniature world map zoom level (pixels per region)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -5184,7 +5256,7 @@
               <key>Type</key>
               <string>F32</string>
               <key>Value</key>
-              <integer>20</integer>
+              <integer>96</integer>
     </map>
     <key>NewCacheLocation</key>
     <map>
@@ -7474,6 +7546,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>ShowStreamTitle</key>
+    <map>
+      <key>Comment</key>
+      <string>Show the title of the song playing on the parcel's stream</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>ShowTangentBasis</key>
     <map>
       <key>Comment</key>
@@ -7540,6 +7623,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>ShowWindlightSettingsPopup</key>
+    <map>
+      <key>Comment</key>
+      <string>Show environment settings popup</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>ShowWorldMap</key>
     <map>
       <key>Comment</key>
@@ -8044,7 +8138,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>500.0</real>
+      <real>1000.0</real>
     </map>
     <key>ToolHelpRect</key>
     <map>
@@ -10256,6 +10350,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>WarnFirstMiniMap</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstMiniMap warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>WarnFirstOverrideKeys</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Rouge%201.xml b/linden/indra/newview/app_settings/windlight/skies/Rouge%201.xml
new file mode 100644
index 0000000..896abf6
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Rouge%201.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.35999998450279236</real>
+            <real>0.42000001668930054</real>
+            <real>0.42000001668930054</real>
+            <real>0.42000001668930054</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.51999998092651367</real>
+            <real>0.2800000011920929</real>
+            <real>0.51999998092651367</real>
+            <real>0.51999998092651367</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0.69999998807907104</real>
+            <real>0.68000000715255737</real>
+            <real>0.69999998807907104</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>1</real>
+            <real>0.79000002145767212</real>
+            <real>0.80000001192092896</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.40999999642372131</real>
+            <real>0.39999997615814209</real>
+            <real>0.88999998569488525</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.28999999165534973</real>
+            <real>0.32999998331069946</real>
+            <real>0.039999999105930328</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.37999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>11.809999465942383</real>
+            <real>12.799999237060547</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00021999998716637492</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.8327431678771973</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.5399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>14.40000057220459</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.85000002384185791</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2.0399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.049999997019767761</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.63680768013000488</real>
+            <real>0.043968122452497482</real>
+            <real>-0.76976805925369263</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>676.10003662109375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>2</real>
+    <key>sun_angle</key>
+        <real>0.043982300907373428</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.369999885559082</real>
+            <real>1.4099999666213989</real>
+            <real>1.0199999809265137</real>
+            <real>2.369999885559082</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Rouge%202.xml b/linden/indra/newview/app_settings/windlight/skies/Rouge%202.xml
new file mode 100644
index 0000000..3b170ac
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Rouge%202.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.84000003337860107</real>
+            <real>0.56999999284744263</real>
+            <real>0.56999999284744263</real>
+            <real>0.84000003337860107</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>1.0799999237060547</real>
+            <real>0.51999998092651367</real>
+            <real>0.51999998092651367</real>
+            <real>1.0799999237060547</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.57999998331069946</real>
+            <real>0.25999999046325684</real>
+            <real>0.25999999046325684</real>
+            <real>0.57999998331069946</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>1</real>
+            <real>0.79000002145767212</real>
+            <real>0.80000001192092896</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.40999999642372131</real>
+            <real>0.39999997615814209</real>
+            <real>0.88999998569488525</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.28999999165534973</real>
+            <real>0.32999998331069946</real>
+            <real>0.039999999105930328</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.37999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>11.809999465942383</real>
+            <real>12.799999237060547</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0002899999963119626</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>5.5999999046325684</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.8327431678771973</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.5399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>14.40000057220459</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.85000002384185791</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2.0399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.049999997019767761</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.63495957851409912</real>
+            <real>0.087851203978061676</real>
+            <real>-0.76753407716751099</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>676.10003662109375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>2</real>
+    <key>sun_angle</key>
+        <real>0.087964601814746857</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.2799999713897705</real>
+            <real>0.75</real>
+            <real>0.59999996423721313</real>
+            <real>2.2799999713897705</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Rouge%203.xml b/linden/indra/newview/app_settings/windlight/skies/Rouge%203.xml
new file mode 100644
index 0000000..5cc7a61
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Rouge%203.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.71999996900558472</real>
+            <real>0.71999996900558472</real>
+            <real>0.71999996900558472</real>
+            <real>0.23999999463558197</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0.094117648899555206</real>
+            <real>0.094117648899555206</real>
+            <real>0.15999999642372131</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.45999997854232788</real>
+            <real>0</real>
+            <real>0.039999999105930328</real>
+            <real>0.45999997854232788</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0.14000000059604645</real>
+            <real>0.14000000059604645</real>
+            <real>0.14000000059604645</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.74000000953674316</real>
+            <real>0.93999999761581421</real>
+            <real>0.20999999344348907</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.65999996662139893</real>
+            <real>0.52999997138977051</real>
+            <real>0.0099999997764825821</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.070000000298023224</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>18</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.34000000357627869</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00018000000272877514</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>6.7000002861022949</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.5185837745666504</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.0399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>17.399999618530273</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.64999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.40999999642372131</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.17000000178813934</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.3677685558795929</real>
+            <real>0.043968122452497482</real>
+            <real>-0.92887735366821289</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>1.0399999618530273</real>
+    <key>sun_angle</key>
+        <real>0.043982300907373428</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.5899999141693115</real>
+            <real>1.5899999141693115</real>
+            <real>1.5899999141693115</real>
+            <real>1.5899999141693115</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Rouge%204.xml b/linden/indra/newview/app_settings/windlight/skies/Rouge%204.xml
new file mode 100644
index 0000000..d48a4a2
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Rouge%204.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.42000001668930054</real>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.42000001668930054</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.59999996423721313</real>
+            <real>0.15999999642372131</real>
+            <real>0.2199999988079071</real>
+            <real>0.59999996423721313</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.029999999329447746</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0.079999998211860657</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.81999999284744263</real>
+            <real>0.18999999761581421</real>
+            <real>0.039999999105930328</real>
+            <real>0.81999999284744263</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.74000000953674316</real>
+            <real>0.93999999761581421</real>
+            <real>0.20999999344348907</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.65999996662139893</real>
+            <real>0.52999997138977051</real>
+            <real>0.0099999997764825821</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>18</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.37999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00015999999595806003</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>17.399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>2.3247785568237305</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.5299999713897705</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>17.399999618530273</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.64999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.079999998211860657</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.72615015506744385</real>
+            <real>0.087851203978061676</real>
+            <real>-0.68190038204193115</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1048</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>1.3199999332427979</real>
+    <key>sun_angle</key>
+        <real>0.087964601814746857</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.5899999141693115</real>
+            <real>0.47999998927116394</real>
+            <real>0.53999996185302734</real>
+            <real>1.5899999141693115</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Rouge%205.xml b/linden/indra/newview/app_settings/windlight/skies/Rouge%205.xml
new file mode 100644
index 0000000..3ceb600
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Rouge%205.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.77999997138977051</real>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.77999997138977051</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>1.5799999237060547</real>
+            <real>0.45999997854232788</real>
+            <real>0.45999997854232788</real>
+            <real>1.5799999237060547</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.97999995946884155</real>
+            <real>0.34000000357627869</real>
+            <real>0.35999998450279236</real>
+            <real>0.97999995946884155</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.74000000953674316</real>
+            <real>0.93999999761581421</real>
+            <real>0.19999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.65999996662139893</real>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.070000000298023224</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>2.8600001335144043</real>
+            <real>17.589999675750732</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.42999997735023499</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00015999999595806003</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>2.1000001430511475</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.7699110507965088</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.1100000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>14.000000953674316</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.89999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.82999998331069946</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.48999997973442078</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.58778512477874756</real>
+            <real>0</real>
+            <real>-0.80901706218719482</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>276</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>1.1699999570846558</real>
+    <key>sun_angle</key>
+        <real>0</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.099999994039535522</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Rouge%206.xml b/linden/indra/newview/app_settings/windlight/skies/Rouge%206.xml
new file mode 100644
index 0000000..c36da85
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Rouge%206.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.77999997138977051</real>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.77999997138977051</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.65999996662139893</real>
+            <real>0.58384609222412109</real>
+            <real>0.58384609222412109</real>
+            <real>0.32999998331069946</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.37999999523162842</real>
+            <real>0.34000000357627869</real>
+            <real>0.35999998450279236</real>
+            <real>0.37999999523162842</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.74000000953674316</real>
+            <real>0.93999999761581421</real>
+            <real>0.19999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.65999996662139893</real>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.070000000298023224</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>2.8600001335144043</real>
+            <real>17.589999675750732</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.42999997735023499</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00015999999595806003</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>2.1000001430511475</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.7699110507965088</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.1100000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>14.000000953674316</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.89999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.82999998331069946</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.2800000011920929</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.58778512477874756</real>
+            <real>0</real>
+            <real>-0.80901706218719482</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>276</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>1.1699999570846558</real>
+    <key>sun_angle</key>
+        <real>0</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.099999994039535522</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 1b1284d..1de3690 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -616,7 +616,7 @@ void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL
 {
         // Look for "/20 foo" channel chats.
         S32 channel = mChannelControl ? (S32)(getChild<LLSpinCtrl>("channel_control")->get()) : 0;
-        //S32 channel = (S32)(getChild<LLSpinCtrl>("ChatChannel")->get());
+
         LLWString out_text = stripChannelNumber(wtext, &channel);
         std::string utf8_out_text = wstring_to_utf8str(out_text);
         std::string utf8_text = wstring_to_utf8str(wtext);
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index caf79eb..954a274 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -998,6 +998,12 @@ GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder, std::stri
                                 (GTK_FILE_CHOOSER(win),
                                  this_path->second.c_str());
                 }
+                else if (getenv("HOME"))
+                {
+                        gtk_file_chooser_set_current_folder
+                                (GTK_FILE_CHOOSER(win),
+                                 getenv("HOME"));
+                }
 
 #  if LL_X11
                 // Make GTK tell the window manager to associate this
diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index ee7053d..b807b17 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -131,6 +131,17 @@ void LLFirstUse::useMap()
 }
 
 // static
+void LLFirstUse::useMiniMap()
+{
+        if (gSavedSettings.getWarning("FirstMiniMap"))
+        {
+                gSavedSettings.setWarning("FirstMiniMap", FALSE);
+
+                LLNotifyBox::showXml("FirstMiniMap");
+        }
+}
+
+// static
 void LLFirstUse::useGoTo()
 {
         // nothing for now JC
diff --git a/linden/indra/newview/llfirstuse.h b/linden/indra/newview/llfirstuse.h
index eef0537..cbb31ab 100644
--- a/linden/indra/newview/llfirstuse.h
+++ b/linden/indra/newview/llfirstuse.h
@@ -92,6 +92,7 @@ public:
         static void useBalanceDecrease(S32 delta);
         static void useSit();
         static void useMap();
+        static void useMiniMap();
         static void useGoTo();
         static void useBuild();
         static void useLeftClickNoHit();
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 63f72af..57c5339 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -119,7 +119,7 @@ LLFloaterAbout::LLFloaterAbout()
           __DATE__, __TIME__);
 
         support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
-        support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), FALSE, FALSE, &viewer_link_style);
+        support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style);
 
         std::string support;
         support.append("\n\n");
@@ -163,7 +163,7 @@ LLFloaterAbout::LLFloaterAbout()
                 support.append("\n");
 
                 support_widget->appendColoredText(support, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
-                support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), FALSE, FALSE, &server_link_style);
+                support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, server_link_style);
 
                 support = "\n\n";
         }
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 68aaceb..1f51a21 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -189,7 +189,7 @@ void LLFloaterChat::updateConsoleVisibility()
                                                         || (getHost() && getHost()->isMinimized() ));   // are we hosted in a minimized floater?
 }
 
-void add_timestamped_line(LLViewerTextEditor* edit, const LLChat &chat, const LLColor4& color)
+void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4& color)
 {
         std::string line = chat.mText;
         bool prepend_newline = true;
@@ -199,20 +199,25 @@ void add_timestamped_line(LLViewerTextEditor* edit, const LLChat &chat, const LL
                 prepend_newline = false;
         }
 
-        // If the msg is not from an agent (not yourself though),
+        // If the msg is from an agent (not yourself though),
         // extract out the sender name and replace it with the hotlinked name.
         if (chat.mSourceType == CHAT_SOURCE_AGENT &&
                 chat.mFromID != LLUUID::null &&
-//              (line.length() > chat.mFromName.length() && line.find(chat.mFromName,0) == 0))
-                (line.length() > chat.mFromName.length() && line.find(chat.mFromName,0) == 0) &&
 // [RLVa] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e)
                 (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) )
 // [/RLVa]
         {
+                chat.mURL = llformat("secondlife:///app/agent/%s/about",chat.mFromID.asString().c_str());
+        }
+
+        // If the chat line has an associated url, link it up to the name.
+        if (!chat.mURL.empty()
+                && (line.length() > chat.mFromName.length() && line.find(chat.mFromName,0) == 0))
+        {
                 std::string start_line = line.substr(0, chat.mFromName.length() + 1);
                 line = line.substr(chat.mFromName.length() + 1);
-                const LLStyleSP &sourceStyle = LLStyleMap::instance().lookup(chat.mFromID);
-                edit->appendStyledText(start_line, false, prepend_newline, &sourceStyle);
+                const LLStyleSP &sourceStyle = LLStyleMap::instance().lookup(chat.mFromID,chat.mURL);
+                edit->appendStyledText(start_line, false, prepend_newline, sourceStyle);
                 prepend_newline = false;
         }
         edit->appendColoredText(line, false, prepend_newline, color);
diff --git a/linden/indra/newview/llfloaterchatterbox.h b/linden/indra/newview/llfloaterchatterbox.h
index 39e1025..04833ab 100644
--- a/linden/indra/newview/llfloaterchatterbox.h
+++ b/linden/indra/newview/llfloaterchatterbox.h
@@ -149,7 +149,14 @@ public:
         {
                 if (visible(instance, key))
                 {
-                        LLFloaterChatterBox::hideInstance();
+                        if(instance->getHost())
+                        {
+                                LLFloaterChatterBox::hideInstance();
+                        }
+                        else
+                        {
+                                VisibilityPolicy<LLFloater>::hide(instance, key);
+                        }
                 }
         }
 
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 8714d4f..3be891e 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -42,14 +42,40 @@
 #include "llresizebar.h"
 #include "lluictrlfactory.h"
 
+// radar
+#include "llfirstuse.h"
+#include "llfloateravatarinfo.h"
+#include "llfloaterfriends.h"
+#include "llfloatergroupinvite.h"
+#include "llfloatergroups.h"
+#include "llfloaterreporter.h"
+#include "llimview.h"
+#include "llmutelist.h"
+#include "llparcel.h"
+#include "llregionposition.h"
+#include "roles_constants.h"
+#include "llscrolllistctrl.h"
+#include "lltracker.h"
+#include "llviewerobjectlist.h"
+#include "llviewermenu.h"
+#include "llviewermessage.h"
+#include "llviewerparcelmgr.h"
+#include "llviewerregion.h"
+#include "llviewerwindow.h"
+#include "llvoavatar.h"
+#include "llworld.h"
+
 LLFloaterMap::LLFloaterMap(const LLSD& key)
         :
         LLFloater(std::string("minimap")),
-        mPanelMap(NULL)
+        mPanelMap(NULL),
+        mUpdate(TRUE)
 {
         LLCallbackMap::map_t factory_map;
         factory_map["mini_mapview"] = LLCallbackMap(createPanelMiniMap, this);
         LLUICtrlFactory::getInstance()->buildFloater(this, "floater_mini_map.xml", &factory_map, FALSE);
+
+        mSelectedAvatar.setNull();
 }
 
 
@@ -67,6 +93,30 @@ BOOL LLFloaterMap::postBuild()
         sendChildToBack(getDragHandle());
         sendChildToFront(getChild<LLButton>("llfloater_close_btn"));
         setIsChrome(TRUE);
+        
+        mRadarList = getChild<LLScrollListCtrl>("RadarList");
+        childSetCommitCallback("RadarList", onList, this);
+        mRadarList->setDoubleClickCallback(onClickIM);
+
+        childSetFocusChangedCallback("near_me_range", onRangeChange, this);
+
+        childSetAction("im_btn", onClickIM, this);
+        childSetAction("profile_btn", onClickProfile, this);
+        childSetAction("offer_teleport_btn", onClickOfferTeleport, this);
+        childSetAction("track_btn", onClickTrack, this);
+        childSetAction("invite_btn", onClickInvite, this);
+        childSetAction("add_btn", onClickAddFriend, this);
+        childSetAction("freeze_btn", onClickFreeze, this);
+        childSetAction("eject_btn", onClickEject, this);
+        childSetAction("mute_btn", onClickMute, this);
+        childSetAction("unmute_btn", onClickUnmute, this);
+        childSetAction("ar_btn", onClickAR, this);
+        childSetAction("estate_eject_btn", onClickEjectFromEstate, this);
+
+        setDefaultBtn("im_btn");
+
+        populateRadar();
+
         return TRUE;
 }
 
@@ -122,13 +172,597 @@ void LLFloaterMap::draw()
         }
 }
 
-
 // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-05 (RLVa-1.0.0c)
 void LLFloaterMap::open()
 {
         if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWMINIMAP))
         {
                 LLFloater::open();
+                LLFirstUse::useMiniMap();
         }
 }
 // [/RLVa:KB]
+
+// TODO: make this detachable
+// TODO: make this expand/collapse
+
+/*
+* Imprudence Radar
+* @brief inworld radar integrated with the minimap
+* by McCabe Maxsted
+* Estate tab portion by Dale Glass
+*/
+
+//static
+void LLFloaterMap::updateRadar()
+{
+        LLFloaterMap::getInstance()->populateRadar();
+}
+
+void LLFloaterMap::populateRadar()
+{
+        if (!mUpdate || !LLFloaterMap::getInstance()->getVisible())
+        {
+                return;
+        }
+
+        if (visibleItemsSelected())
+        {
+                mSelectedAvatar = mRadarList->getFirstSelected()->getUUID();
+        }
+        else
+        {
+                mSelectedAvatar.setNull();
+        }
+
+        S32 scroll_pos = mRadarList->getScrollPos();
+
+        LLVector3d current_pos = gAgent.getPositionGlobal();
+
+        // find what avatars you can see
+        std::vector<LLUUID> avatar_ids;
+        std::vector<LLVector3d> positions;
+        LLWorld::getInstance()->getAvatars(&avatar_ids, &positions, current_pos, gSavedSettings.getF32("NearMeRange"));
+
+        LLSD element;
+
+        mRadarList->deleteAllItems();
+
+        for (U32 i=0; i<avatar_ids.size(); i++)
+        {
+                if (avatar_ids[i] == gAgent.getID() ||
+                        avatar_ids[i].isNull())
+                {
+                        continue;
+                }
+
+                // Add to list only if we get their name
+                std::string fullname = getSelectedName(avatar_ids[i]);
+                if (!fullname.empty())
+                {
+                        std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("muted") : "";
+                        element["id"] = avatar_ids[i];
+                        element["columns"][0]["column"] = "avatar_name";
+                        element["columns"][0]["type"] = "text";
+                        element["columns"][0]["value"] = fullname + " " + mute_text;
+                        element["columns"][1]["column"] = "avatar_distance";
+                        element["columns"][1]["type"] = "text";
+
+                        LLVector3d temp = positions[i] - current_pos;
+                        F32 distance = (F32)temp.magVec();
+                        char dist[32];
+                        snprintf(dist, sizeof(dist), "%.1f", distance);
+                        element["columns"][1]["value"] = strcat(dist,"m");
+
+                        mRadarList->addElement(element, ADD_BOTTOM);
+                }
+        }
+
+        mRadarList->sortItems();
+        mRadarList->setScrollPos(scroll_pos);
+        if (mSelectedAvatar.notNull())
+        {
+                mRadarList->selectByID(mSelectedAvatar);
+        }
+
+        // set count
+        std::stringstream avatar_count; 
+        avatar_count.str("");
+        if (avatar_ids.empty())
+        {
+                mRadarList->addCommentText(getString("no_one_near"), ADD_TOP);
+                avatar_count << "0";
+        }
+        else
+        {
+                avatar_count << (int)avatar_ids.size();
+        }
+        childSetText("lblAvatarCount", avatar_count.str());
+
+        toggleButtons();
+
+        //llinfos << "mSelectedAvatar: " << mSelectedAvatar.asString() << llendl;
+}
+
+void LLFloaterMap::toggleButtons()
+{
+        BOOL enable = FALSE;
+        BOOL enable_unmute = FALSE;
+        BOOL enable_track = FALSE;
+        BOOL enable_estate = FALSE;
+        if (childHasFocus("RadarPanel"))
+        {
+                enable = mSelectedAvatar.notNull() ? visibleItemsSelected() : FALSE;
+                enable_unmute = mSelectedAvatar.notNull() ? LLMuteList::getInstance()->isMuted(mSelectedAvatar) : FALSE;
+                enable_track = gAgent.isGodlike() || is_agent_mappable(mSelectedAvatar);
+                enable_estate = getKickable(mSelectedAvatar);
+        }
+        else
+        {
+                mRadarList->deselect();
+        }
+
+        childSetEnabled("im_btn", enable);
+        childSetEnabled("profile_btn", enable);
+        childSetEnabled("offer_teleport_btn", enable);
+        childSetEnabled("track_btn", enable_track);
+        childSetEnabled("invite_btn", enable);
+        childSetEnabled("add_btn", enable);
+        childSetEnabled("freeze_btn", enable_estate);
+        childSetEnabled("eject_btn", enable_estate);
+        childSetEnabled("mute_btn", enable);
+        childSetEnabled("unmute_btn", enable_unmute);
+        childSetEnabled("ar_btn", enable);
+        childSetEnabled("estate_eject_btn", enable_estate);
+}
+
+BOOL LLFloaterMap::getKickable(const LLUUID &agent_id)
+{
+        if (agent_id.notNull())
+        {
+                LLViewerObject* av_obj = gObjectList.findObject(agent_id);
+                if (av_obj != NULL && av_obj->isAvatar())
+                {
+                        LLVOAvatar* avatar = (LLVOAvatar*)av_obj;
+                        LLViewerRegion* region = avatar->getRegion();
+                        if (region)
+                        {
+                                const LLVector3& pos = avatar->getPositionRegion();
+                                const LLVector3d& pos_global = avatar->getPositionGlobal();
+                                if (LLWorld::getInstance()->positionRegionValidGlobal(pos_global))
+                                {
+                                        LLParcel* parcel = LLViewerParcelMgr::getInstance()->selectParcelAt(pos_global)->getParcel();
+                                        
+                                        BOOL new_value = (region != NULL);
+                                                                
+                                        if (new_value)
+                                        {
+                                                new_value = region->isOwnedSelf(pos);
+                                                if (!new_value || region->isOwnedGroup(pos))
+                                                {
+                                                        new_value = LLViewerParcelMgr::getInstance()->isParcelOwnedByAgent(parcel,GP_LAND_ADMIN);
+                                                }
+                                        }
+                                        return new_value;
+                                }
+                        }
+                }
+        }
+        return FALSE;   
+}
+
+// static
+void LLFloaterMap::onList(LLUICtrl* ctrl, void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*)user_data;
+        if (self)
+        {
+                self->toggleButtons();
+        }
+}
+
+BOOL LLFloaterMap::visibleItemsSelected() const
+{
+        if (mRadarList->getFirstSelectedIndex() >= 0)
+        {
+                return TRUE;
+        }
+        return FALSE;
+}
+
+// static
+void LLFloaterMap::onRangeChange(LLFocusableElement* focus, void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*)user_data;
+        if (self)
+        {
+                self->mUpdate = !(self->childHasFocus("near_me_range"));
+        }
+}
+
+// static
+LLUUID LLFloaterMap::getSelected()
+{
+        return LLFloaterMap::getInstance()->mSelectedAvatar;
+}
+
+//
+// Avatar tab
+//
+
+// static
+void LLFloaterMap::onClickIM(void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                gIMMgr->setFloaterOpen(TRUE);
+                gIMMgr->addSession(getSelectedName(agent_id), IM_NOTHING_SPECIAL, agent_id);
+        }
+}
+
+// static
+void LLFloaterMap::onClickProfile(void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                LLFloaterAvatarInfo::show(agent_id);
+        }
+}
+
+// static
+void LLFloaterMap::onClickOfferTeleport(void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                handle_lure(agent_id);
+        }
+}
+
+// static
+void LLFloaterMap::onClickTrack(void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        LLTracker::ETrackingStatus tracking_status = LLTracker::getTrackingStatus();
+        
+        if (LLTracker::TRACKING_AVATAR == tracking_status)
+        {
+                LLTracker::stopTracking(NULL);
+        }
+        else
+        {
+                LLScrollListItem *item = self->mRadarList->getFirstSelected();
+                if (item != NULL)
+                {
+                        LLUUID agent_id = item->getUUID();
+                        LLTracker::trackAvatar(agent_id, getSelectedName(agent_id));
+                }
+        }
+}
+
+// static
+void LLFloaterMap::onClickInvite(void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                LLFloaterGroupPicker* widget;
+                widget = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));
+                if (widget)
+                {
+                        widget->center();
+                        widget->setPowersMask(GP_MEMBER_INVITE);
+                        widget->setSelectCallback(callback_invite_to_group, (void *)&agent_id);
+                }
+        }
+}
+
+// static
+void LLFloaterMap::callback_invite_to_group(LLUUID group_id, void *user_data)
+{
+        std::vector<LLUUID> agent_ids;
+        agent_ids.push_back(*(LLUUID *)user_data);
+        
+        LLFloaterGroupInvite::showForGroup(group_id, &agent_ids);
+}
+
+// static
+void LLFloaterMap::onClickAddFriend(void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                LLPanelFriends::requestFriendshipDialog(agent_id, getSelectedName(agent_id));
+        }
+}
+
+//
+// Estate tab
+//
+
+//static 
+std::string LLFloaterMap::getSelectedName(const LLUUID &agent_id)
+{
+        std::string agent_name;
+        if(gCacheName->getFullName(agent_id, agent_name) && agent_name != " ")
+        {
+                return agent_name;
+        }
+        return LLStringUtil::null;
+}
+
+//static 
+void LLFloaterMap::callbackFreeze(S32 option, void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+
+        if ( option == 0 )
+        {
+                sendFreeze(self->mSelectedAvatar, true);
+        }
+        else if ( option == 1 )
+        {
+                sendFreeze(self->mSelectedAvatar, false);
+        }
+}
+
+//static 
+void LLFloaterMap::callbackEject(S32 option, void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+ 
+        if ( option == 0 )
+        {
+                sendEject(self->mSelectedAvatar, false);
+        }
+        else if ( option == 1 )
+        {
+                sendEject(self->mSelectedAvatar, true);
+        }
+}
+
+//static 
+void LLFloaterMap::callbackEjectFromEstate(S32 option, void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+
+        if ( option == 0 )
+        {
+                cmdEstateEject(self->mSelectedAvatar);
+        } 
+        else if ( option == 1 )
+        {
+                cmdEstateBan(self->mSelectedAvatar);
+        }
+}
+
+void LLFloaterMap::onClickFreeze(void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        LLStringUtil::format_map_t args;
+        LLSD payload;
+        args["[AVATAR_NAME]"] = getSelectedName(self->mSelectedAvatar);
+        gViewerWindow->alertXml("FreezeAvatarFullname", args, callbackFreeze, user_data);
+}
+
+//static
+void LLFloaterMap::onClickEject(void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        LLStringUtil::format_map_t args;
+        LLSD payload;
+        args["AVATAR_NAME"] = getSelectedName(self->mSelectedAvatar);
+        gViewerWindow->alertXml("EjectAvatarFullName", args, callbackEject, user_data);
+}
+
+//static
+void LLFloaterMap::onClickMute(void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                std::string agent_name = getSelectedName(agent_id);
+                if (LLMuteList::getInstance()->isMuted(agent_id))
+                {
+                        //LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                        //LLMuteList::getInstance()->remove(mute);      
+                        //LLFloaterMute::getInstance()->selectMute(agent_id);
+                }
+                else
+                {
+                        LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                        LLMuteList::getInstance()->add(mute);
+                }
+        }
+}
+
+//static
+void LLFloaterMap::onClickUnmute(void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                std::string agent_name = getSelectedName(agent_id);
+                if (LLMuteList::getInstance()->isMuted(agent_id))
+                {
+                        LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                        LLMuteList::getInstance()->remove(mute);        
+                        //LLFloaterMute::getInstance()->selectMute(agent_id);
+                }
+                else
+                {
+                        //LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                        //LLMuteList::getInstance()->add(mute);
+                }
+        }
+}
+
+//static
+void LLFloaterMap::onClickEjectFromEstate(void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        LLStringUtil::format_map_t args;
+        LLSD payload;
+        args["EVIL_USER"] = getSelectedName(self->mSelectedAvatar);
+        gViewerWindow->alertXml("EstateKickUser", args, callbackEjectFromEstate, user_data);
+}
+
+//static
+void LLFloaterMap::onClickAR(void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        LLUUID agent_id = self->mSelectedAvatar;
+                
+        if (agent_id.notNull())
+        {
+                        LLFloaterReporter::showFromObject(agent_id);
+        }
+}
+
+// static 
+void LLFloaterMap::cmdEstateEject(const LLUUID &avatar)
+{ 
+        sendEstateMessage("teleporthomeuser", avatar); 
+}
+
+// static 
+void LLFloaterMap::cmdEstateBan(const LLUUID &avatar)
+{
+        sendEstateMessage("teleporthomeuser", avatar); // Kick first, just to be sure
+        sendEstateBan(avatar);
+}
+
+// static 
+void LLFloaterMap::sendFreeze(const LLUUID& avatar_id, bool freeze)
+{
+        U32 flags = 0x0;
+        if (!freeze)
+        {
+                // unfreeze
+                flags |= 0x1;
+        }
+
+        LLMessageSystem* msg = gMessageSystem;
+        LLViewerObject* avatar = gObjectList.findObject(avatar_id);
+
+        if (avatar)
+        {
+                msg->newMessage("FreezeUser");
+                msg->nextBlock("AgentData");
+                msg->addUUID("AgentID", gAgent.getID());
+                msg->addUUID("SessionID", gAgent.getSessionID());
+                msg->nextBlock("Data");
+                msg->addUUID("TargetID", avatar_id );
+                msg->addU32("Flags", flags );
+                msg->sendReliable( avatar->getRegion()->getHost() );
+        }
+}
+
+// static 
+void LLFloaterMap::sendEject(const LLUUID& avatar_id, bool ban)
+{       
+        LLMessageSystem* msg = gMessageSystem;
+        LLViewerObject* avatar = gObjectList.findObject(avatar_id);
+
+        if (avatar)
+        {
+                U32 flags = 0x0;
+                if ( ban )
+                {
+                        // eject and add to ban list
+                        flags |= 0x1;
+                }
+
+                msg->newMessage("EjectUser");
+                msg->nextBlock("AgentData");
+                msg->addUUID("AgentID", gAgent.getID() );
+                msg->addUUID("SessionID", gAgent.getSessionID() );
+                msg->nextBlock("Data");
+                msg->addUUID("TargetID", avatar_id );
+                msg->addU32("Flags", flags );
+                msg->sendReliable( avatar->getRegion()->getHost() );
+        }
+}
+
+// static 
+void LLFloaterMap::sendEstateMessage(const char* request, const LLUUID &target)
+{
+
+        LLMessageSystem* msg = gMessageSystem;
+        LLUUID invoice;
+
+        // This seems to provide an ID so that the sim can say which request it's
+        // replying to. I think this can be ignored for now.
+        invoice.generate();
+
+        llinfos << "Sending estate request '" << request << "'" << llendl;
+        msg->newMessage("EstateOwnerMessage");
+        msg->nextBlockFast(_PREHASH_AgentData);
+        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
+        msg->nextBlock("MethodData");
+        msg->addString("Method", request);
+        msg->addUUID("Invoice", invoice);
+
+        // Agent id
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", gAgent.getID().asString().c_str());
+
+        // Target
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", target.asString().c_str());
+
+        msg->sendReliable(gAgent.getRegion()->getHost());
+}
+
+// static 
+void LLFloaterMap::sendEstateBan(const LLUUID& agent)
+{
+        LLUUID invoice;
+        U32 flags = ESTATE_ACCESS_BANNED_AGENT_ADD;
+
+        invoice.generate();
+
+        LLMessageSystem* msg = gMessageSystem;
+        msg->newMessage("EstateOwnerMessage");
+        msg->nextBlockFast(_PREHASH_AgentData);
+        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
+
+        msg->nextBlock("MethodData");
+        msg->addString("Method", "estateaccessdelta");
+        msg->addUUID("Invoice", invoice);
+
+        char buf[MAX_STRING];           /* Flawfinder: ignore*/
+        gAgent.getID().toString(buf);
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", buf);
+
+        snprintf(buf, MAX_STRING, "%u", flags);                 /* Flawfinder: ignore */
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", buf);
+
+        agent.toString(buf);
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", buf);
+
+        gAgent.sendReliableMessage();
+}
diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h
index 857b1ed..81e4159 100644
--- a/linden/indra/newview/llfloatermap.h
+++ b/linden/indra/newview/llfloatermap.h
@@ -33,6 +33,7 @@
 #define LL_LLFLOATERMAP_H
 
 #include "llfloater.h"
+#include "llscrolllistctrl.h"
 
 class LLNetMap;
 
@@ -46,6 +47,9 @@ public:
 
         static void* createPanelMiniMap(void* data);
 
+        static void updateRadar();
+        static LLUUID getSelected();
+
         BOOL postBuild();
 
         /*virtual*/ void        draw();
@@ -59,7 +63,46 @@ public:
 
 private:
         LLFloaterMap(const LLSD& key = LLSD());
-        LLNetMap*               mPanelMap;
+
+        LLNetMap*                                               mPanelMap;
+        LLScrollListCtrl*                               mRadarList;
+        LLUUID                                                  mSelectedAvatar;
+        bool                                                    mUpdate;
+        
+        static void onList(LLUICtrl* ctrl, void* user_data);
+        static void onRangeChange(LLFocusableElement* focus, void* user_data);
+        BOOL visibleItemsSelected() const;
+        BOOL getKickable(const LLUUID &agent_id);
+        void toggleButtons();
+        void populateRadar();
+
+        static void onClickProfile(void* user_data);
+        static void onClickIM(void* user_data);
+        static void onClickAddFriend(void* user_data);
+        static void onClickOfferTeleport(void* user_data);
+        static void onClickTrack(void* user_data);
+        static void onClickInvite(void* user_data);
+        static void callback_invite_to_group(LLUUID group_id, void *user_data);
+
+        static std::string getSelectedName(const LLUUID &agent_id);
+        static void onClickFreeze(void *user_data);
+        static void onClickEject(void *user_data);
+        static void onClickMute(void *user_data);
+        static void onClickUnmute(void *user_data);
+        static void onClickAR(void *user_data);
+        static void onClickEjectFromEstate(void *user_data);
+
+        static void callbackFreeze(S32 option, void *user_data);
+        static void callbackEject(S32 option, void *user_data);
+        static void callbackAR(void *user_data);
+        static void callbackEjectFromEstate(S32 option, void *user_data);
+
+        static void sendFreeze(const LLUUID &avatar, bool);
+        static void sendEject(const LLUUID &avatar, bool);
+        static void cmdEstateEject(const LLUUID &avatar);
+        static void cmdEstateBan(const LLUUID &avatar);
+        static void sendEstateBan(const LLUUID& agent);
+        static void sendEstateMessage(const char* request, const LLUUID &target);
 };
 
 #endif  // LL_LLFLOATERMAP_H
diff --git a/linden/indra/newview/llfloaterobjectiminfo.cpp b/linden/indra/newview/llfloaterobjectiminfo.cpp
new file mode 100644
index 0000000..6cbc4e2
--- /dev/null
+++ b/linden/indra/newview/llfloaterobjectiminfo.cpp
@@ -0,0 +1,204 @@
+/**
+ * @file llfloaterobjectiminfo.cpp
+ * @brief A floater with information about an object that sent an IM.
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ *
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloaterobjectiminfo.h"
+
+#include "llagentdata.h"
+#include "llcachename.h"
+#include "llcommandhandler.h"
+#include "llfloater.h"
+#include "llfloateravatarinfo.h"
+#include "llfloatergroupinfo.h"
+#include "llfloatermute.h"
+#include "llmutelist.h"
+#include "llsdutil.h"
+#include "lluictrlfactory.h"
+#include "llurldispatcher.h"
+#include "llviewercontrol.h"
+
+////////////////////////////////////////////////////////////////////////////
+// LLFloaterObjectIMInfo
+class LLFloaterObjectIMInfo : public LLFloater, public LLFloaterSingleton<LLFloaterObjectIMInfo>
+{
+public:
+        LLFloaterObjectIMInfo(const LLSD& sd);
+        virtual ~LLFloaterObjectIMInfo() { };
+
+        BOOL postBuild(void);
+
+        void update(const LLUUID& id, const std::string& name, const std::string& slurl, const LLUUID& owner, bool owner_is_group);
+
+        // UI Handlers
+        static void onClickMap(void* data);
+        static void onClickOwner(void* data);
+        static void onClickMute(void* data);
+
+        static void nameCallback(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* data);
+
+private:
+        LLUUID mObjectID;
+        std::string mObjectName;
+        std::string mSlurl;
+        LLUUID mOwnerID;
+        std::string mOwnerName;
+        bool mOwnerIsGroup;
+};
+
+LLFloaterObjectIMInfo::LLFloaterObjectIMInfo(const LLSD& seed)
+: mObjectID(), mObjectName(), mSlurl(), mOwnerID(), mOwnerName(), mOwnerIsGroup(false)
+{
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_object_im_info.xml");
+
+        if (getRect().mLeft == 0
+                && getRect().mBottom == 0)
+        {
+                center();
+        }
+}
+
+BOOL LLFloaterObjectIMInfo::postBuild(void)
+{
+        childSetAction("Mute",onClickMute,this);
+        childSetActionTextbox("OwnerName",onClickOwner, this);
+        childSetActionTextbox("Slurl",onClickMap, this);
+
+        return true;
+}
+
+void LLFloaterObjectIMInfo::update(const LLUUID& object_id, const std::string& name, const std::string& slurl, const LLUUID& owner_id, bool owner_is_group)
+{
+        // When talking to an old region we won't have a slurl.
+        // The object id isn't really the object id either but we don't use it so who cares.
+        bool have_slurl = !slurl.empty();
+        childSetVisible("Unknown_Slurl",!have_slurl);
+        childSetVisible("Slurl",have_slurl);
+
+        childSetText("ObjectName",name);
+        childSetText("Slurl",slurl);
+        childSetText("OwnerName",std::string(""));
+
+        bool my_object = (owner_id == gAgentID);
+        childSetEnabled("Mute",!my_object);
+
+        mObjectID = object_id;
+        mObjectName = name;
+        mSlurl = slurl;
+        mOwnerID = owner_id;
+        mOwnerIsGroup = owner_is_group;
+
+        if (gCacheName) gCacheName->get(owner_id,owner_is_group,nameCallback,this);
+}
+
+//static
+void LLFloaterObjectIMInfo::onClickMap(void* data)
+{
+        LLFloaterObjectIMInfo* self = (LLFloaterObjectIMInfo*)data;
+
+        std::ostringstream link;
+        link << "secondlife://" << self->mSlurl;
+        LLURLDispatcher::dispatch(link.str(),false);
+}
+
+//static
+void LLFloaterObjectIMInfo::onClickOwner(void* data)
+{
+        LLFloaterObjectIMInfo* self = (LLFloaterObjectIMInfo*)data;
+        if (self->mOwnerIsGroup)
+        {
+                LLFloaterGroupInfo::showFromUUID(self->mOwnerID);
+        }
+        else
+        {
+                LLFloaterAvatarInfo::showFromObject(self->mOwnerID);
+        }
+}
+
+//static
+void LLFloaterObjectIMInfo::onClickMute(void* data)
+{
+        LLFloaterObjectIMInfo* self = (LLFloaterObjectIMInfo*)data;
+
+        LLMute::EType mute_type = (self->mOwnerIsGroup) ? LLMute::GROUP : LLMute::AGENT;
+        LLMute mute(self->mOwnerID, self->mOwnerName, mute_type);
+        LLMuteList::getInstance()->add(mute);
+        LLFloaterMute::showInstance();
+        self->close();
+}
+
+//static
+void LLFloaterObjectIMInfo::nameCallback(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* data)
+{
+        LLFloaterObjectIMInfo* self = (LLFloaterObjectIMInfo*)data;
+        self->mOwnerName = first;
+        if (!last.empty())
+        {
+                self->mOwnerName += " " + last;
+        }
+
+        self->childSetText("OwnerName",self->mOwnerName);
+}
+
+////////////////////////////////////////////////////////////////////////////
+// LLObjectIMInfo
+void LLObjectIMInfo::show(const LLUUID &object_id, const std::string &name, const std::string &location, const LLUUID &owner_id, bool owner_is_group)
+{
+        LLFloaterObjectIMInfo* im_info_floater = LLFloaterObjectIMInfo::showInstance();
+        im_info_floater->update(object_id,name,location,owner_id,owner_is_group);
+}
+
+////////////////////////////////////////////////////////////////////////////
+// LLObjectIMInfoHandler
+class LLObjectIMInfoHandler : public LLCommandHandler
+{
+public:
+        LLObjectIMInfoHandler() : LLCommandHandler("objectim", false) { }
+
+        bool handle(const LLSD& tokens, const LLSD& query_map);
+};
+
+// Creating the object registers with the dispatcher.
+LLObjectIMInfoHandler gObjectIMHandler;
+
+// ex. secondlife:///app/objectim/9426adfc-9c17-8765-5f09-fdf19957d003?owner=a112d245-9095-4e9c-ace4-ffa31717f934&groupowned=true&slurl=ahern/123/123/123&name=Object
+bool LLObjectIMInfoHandler::handle(const LLSD &tokens, const LLSD &query_map)
+{
+        LLUUID task_id = tokens[0].asUUID();
+        std::string name = query_map["name"].asString();
+        std::string slurl = query_map["slurl"].asString();
+        LLUUID owner = query_map["owner"].asUUID();
+        bool group_owned = query_map.has("groupowned");
+
+        LLObjectIMInfo::show(task_id,name,slurl,owner,group_owned);
+
+        return true;
+}
diff --git a/linden/indra/newview/llfloaterobjectiminfo.h b/linden/indra/newview/llfloaterobjectiminfo.h
new file mode 100644
index 0000000..0564c3e
--- /dev/null
+++ b/linden/indra/newview/llfloaterobjectiminfo.h
@@ -0,0 +1,45 @@
+/**
+ * @file llfloaterobjectiminfo.h
+ * @brief Shows a dialog with information about an object.
+ *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ *
+ * Copyright (c) 2006-2008, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLFLOATEROBJECTIMINFO_H
+#define LL_LLFLOATEROBJECTIMINFO_H
+
+namespace LLObjectIMInfo
+{
+        // Show an LLFloaterObjectIMInfo for this object.
+        static void show(const LLUUID& object_id,
+                                                const std::string& name,
+                                                const std::string& location,
+                                                const LLUUID& owner_id,
+                                                bool owner_is_group);
+};
+
+#endif // LL_LLFLOATERURLDISPLAY_H
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index b63138f..d2a8040 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -693,7 +693,8 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
                 LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() &&
                 !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment())
         {
-                if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 
+                if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() > 0 &&
+                        LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 
                         LLSelectMgr::getInstance()->getSelection()->getObjectCount())
                 {
                         can_unlink = true;
diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp
index 4b0dd04..9936f3b 100644
--- a/linden/indra/newview/llfloaterwindlight.cpp
+++ b/linden/indra/newview/llfloaterwindlight.cpp
@@ -60,6 +60,7 @@
 
 #undef max
 
+
 LLFloaterWindLight* LLFloaterWindLight::sWindLight = NULL;
 
 std::set<std::string> LLFloaterWindLight::sDefaultPresets;
@@ -227,6 +228,10 @@ void LLFloaterWindLight::initCallbacks(void) {
         // Dome
         childSetCommitCallback("WLGamma", onFloatControlMoved, &param_mgr->mWLGamma);
         childSetCommitCallback("WLStarAlpha", onStarAlphaMoved, NULL);
+
+        // next/prev buttons
+        childSetAction("next", onClickNext, this);
+        childSetAction("prev", onClickPrev, this);
 }
 
 void LLFloaterWindLight::onClickHelp(void* data)
@@ -1001,3 +1006,51 @@ void LLFloaterWindLight::deactivateAnimator()
         LLWLParamManager::instance()->mAnimator.mIsRunning = false;
         LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
 }
+
+void LLFloaterWindLight::onClickNext(void* user_data)
+{
+        LLWLParamManager * param_mgr = LLWLParamManager::instance();
+        LLWLParamSet& currentParams = param_mgr->mCurParams;
+
+        // find place of current param
+        std::map<std::string, LLWLParamSet>::iterator mIt = 
+                param_mgr->mParamList.find(currentParams.mName);
+
+        // if at the end, loop
+        std::map<std::string, LLWLParamSet>::iterator last = param_mgr->mParamList.end(); --last;
+        if(mIt == last) 
+        {
+                mIt = param_mgr->mParamList.begin();
+        }
+        else
+        {
+                mIt++;
+        }
+        param_mgr->mAnimator.mIsRunning = false;
+        param_mgr->mAnimator.mUseLindenTime = false;
+        param_mgr->loadPreset(mIt->first, true);
+}
+
+void LLFloaterWindLight::onClickPrev(void* user_data)
+{
+        LLWLParamManager * param_mgr = LLWLParamManager::instance();
+        LLWLParamSet& currentParams = param_mgr->mCurParams;
+
+        // find place of current param
+        std::map<std::string, LLWLParamSet>::iterator mIt = 
+                param_mgr->mParamList.find(currentParams.mName);
+
+        // if at the beginning, loop
+        if(mIt == param_mgr->mParamList.begin()) 
+        {
+                std::map<std::string, LLWLParamSet>::iterator last = param_mgr->mParamList.end(); --last;
+                mIt = last;
+        }
+        else
+        {
+                mIt--;
+        }
+        param_mgr->mAnimator.mIsRunning = false;
+        param_mgr->mAnimator.mUseLindenTime = false;
+        param_mgr->loadPreset(mIt->first, true);
+}
diff --git a/linden/indra/newview/llfloaterwindlight.h b/linden/indra/newview/llfloaterwindlight.h
index 3e5556b..70e76c5 100644
--- a/linden/indra/newview/llfloaterwindlight.h
+++ b/linden/indra/newview/llfloaterwindlight.h
@@ -136,6 +136,9 @@ private:
         static LLFloaterWindLight* sWindLight;
 
         static std::set<std::string> sDefaultPresets;
+
+        static void onClickNext(void* user_data);
+        static void onClickPrev(void* user_data);
 };
 
 
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index 70c4ead..5407f06 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -281,7 +281,28 @@ void LLFolderViewItem::refreshFromListener()
 {
         if(mListener)
         {
+                //Super crazy hack to build the creator search label - RK
+                LLInventoryItem* item = gInventory.getItem(mListener->getUUID());
+                std::string creator_name;
+                if(item)
+                {
+                        if(item->getCreatorUUID().notNull())
+                        {
+                                gCacheName->getFullName(item->getCreatorUUID(), creator_name);
+                        }
+                }
+                mLabelCreator = creator_name;
+                /*if(creator_name == "(Loading...)")
+                        mLabelCreator = "";
+                else
+                        mLabelCreator = creator_name;*/
+                
+                //Label for name search
                 mLabel = mListener->getDisplayName();
+
+                //Build label for combined search - RK
+                mLabelAll = mLabel + " " + mLabelCreator;
+
                 setIcon(mListener->getIcon());
                 time_t creation_date = mListener->getCreationDate();
                 if (mCreationDate != creation_date)
@@ -299,12 +320,26 @@ void LLFolderViewItem::refresh()
         refreshFromListener();
         
         std::string searchable_label(mLabel);
+        std::string searchable_label_creator(mLabelCreator);
+        std::string searchable_label_all(mLabelAll);
+
+        //add the (no modify), (no transfer) etc stuff to each label.
         searchable_label.append(mLabelSuffix);
+        searchable_label_creator.append(mLabelSuffix);
+        searchable_label_all.append(mLabelSuffix);
+
+        //all labels need to be uppercase.
         LLStringUtil::toUpper(searchable_label);
+        LLStringUtil::toUpper(searchable_label_creator);
+        LLStringUtil::toUpper(searchable_label_all);
 
-        if (mSearchableLabel.compare(searchable_label))
+        if (mSearchableLabel.compare(searchable_label) || 
+                mSearchableLabelCreator.compare(searchable_label_creator))
         {
                 mSearchableLabel.assign(searchable_label);
+                mSearchableLabelCreator.assign(searchable_label_creator);
+                mSearchableLabelAll.assign(searchable_label_all);
+
                 dirtyFilter();
                 // some part of label has changed, so overall width has potentially changed
                 if (mParentFolder)
@@ -588,7 +623,13 @@ void LLFolderViewItem::rename(const std::string& new_name)
 
 const std::string& LLFolderViewItem::getSearchableLabel() const
 {
-        return mSearchableLabel;
+        U32 search_type = gSavedSettings.getU32("InventorySearchType");
+        if(search_type == 4)
+                return mSearchableLabelAll;
+        else if(search_type == 1)
+                return mSearchableLabelCreator;
+        else
+                return mSearchableLabel;
 }
 
 const std::string& LLFolderViewItem::getName( void ) const
diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h
index 3c350d4..25b4362 100644
--- a/linden/indra/newview/llfolderview.h
+++ b/linden/indra/newview/llfolderview.h
@@ -338,6 +338,11 @@ protected:
 
         std::string                                     mLabel;
         std::string                                     mSearchableLabel;
+        std::string                                     mLabelAll;
+        std::string                                     mSearchableLabelAll;
+        std::string                                     mLabelCreator;
+        std::string                                     mSearchableLabelCreator;
+
         std::string                                     mType;
         S32                                                     mLabelWidth;
         U32                                                     mCreationDate;
diff --git a/linden/indra/newview/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp
index 37897eb..2f8e838 100644
--- a/linden/indra/newview/llgroupnotify.cpp
+++ b/linden/indra/newview/llgroupnotify.cpp
@@ -220,8 +220,8 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
         static const LLStyleSP headerstyle(new LLStyle(true,LLColor4::black,"SansSerifBig"));
         static const LLStyleSP datestyle(new LLStyle(true,LLColor4::black,"serif"));
 
-        text->appendStyledText(subject,false,false,&headerstyle);
-        text->appendStyledText(time_buf,false,false,&datestyle);
+        text->appendStyledText(subject,false,false,headerstyle);
+        text->appendStyledText(time_buf,false,false,datestyle);
         // Sadly, our LLTextEditor can't handle both styled and unstyled text
         // at the same time.  Hence this space must be styled. JC
         text->appendColoredText(std::string(" "),false,false,LLColor4::grey4);
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 7e4ed19..014c050 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1543,8 +1543,8 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4
                 else
                 {
                         // Convert the name to a hotlink and add to message.
-                        const LLStyleSP &source_style = LLStyleMap::instance().lookup(source);
-                        mHistoryEditor->appendStyledText(name,false,prepend_newline,&source_style);
+                        const LLStyleSP &source_style = LLStyleMap::instance().lookupAgent(source);
+                        mHistoryEditor->appendStyledText(name,false,prepend_newline,source_style);
                 }
                 prepend_newline = false;
         }
diff --git a/linden/indra/newview/llinventoryactions.cpp b/linden/indra/newview/llinventoryactions.cpp
index 0bf3ab2..b598c83 100644
--- a/linden/indra/newview/llinventoryactions.cpp
+++ b/linden/indra/newview/llinventoryactions.cpp
@@ -85,6 +85,9 @@
 #include "lluictrlfactory.h"
 #include "llselectmgr.h"
 
+// Defined in llinventorybridge.cpp
+void wear_attachments_on_avatar(const std::set<LLUUID>& item_ids, BOOL remove);
+
 const std::string NEW_LSL_NAME = "New Script"; // *TODO:Translate? (probably not)
 const std::string NEW_NOTECARD_NAME = "New Note"; // *TODO:Translate? (probably not)
 const std::string NEW_GESTURE_NAME = "New Gesture"; // *TODO:Translate? (probably not)
@@ -115,6 +118,12 @@ bool doToSelected(LLFolderView* folder, std::string action)
         std::set<LLUUID> selected_items;
         folder->getSelectionList(selected_items);
 
+        if ( ("attach" == action) && (selected_items.size() > 1) )
+        {
+                wear_attachments_on_avatar(selected_items, FALSE);
+                return true;
+        }
+
         LLMultiPreview* multi_previewp = NULL;
         LLMultiProperties* multi_propertiesp = NULL;
 
@@ -464,6 +473,40 @@ class LLDoCreateFloater : public inventory_listener_t
         }
 };
 
+//Handles the search type buttons
+class SetSearchType : public inventory_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                std::string search_type = userdata.asString();
+                if(search_type == "name")
+                {
+                        gSavedSettings.setU32("InventorySearchType", 0);
+
+                        mPtr->getControl("Inventory.SearchByName")->setValue(TRUE);
+                        mPtr->getControl("Inventory.SearchByCreator")->setValue(FALSE);                 
+                        mPtr->getControl("Inventory.SearchByAll")->setValue(FALSE);
+                }
+                else if(search_type == "creator")
+                {
+                        gSavedSettings.setU32("InventorySearchType", 1);
+
+                        mPtr->getControl("Inventory.SearchByName")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByCreator")->setValue(TRUE);
+                        mPtr->getControl("Inventory.SearchByAll")->setValue(FALSE);
+                }
+                else if(search_type == "all")
+                {
+                        gSavedSettings.setU32("InventorySearchType", 4);
+
+                        mPtr->getControl("Inventory.SearchByName")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByCreator")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByAll")->setValue(TRUE);
+                }
+        return true;
+        }
+};
+
 class LLSetSortBy : public inventory_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -711,6 +754,8 @@ void init_inventory_actions(LLInventoryView *floater)
         (new LLShowFilters())->registerListener(floater, "Inventory.ShowFilters");
         (new LLResetFilter())->registerListener(floater, "Inventory.ResetFilter");
         (new LLSetSortBy())->registerListener(floater, "Inventory.SetSortBy");
+        
+        (new SetSearchType())->registerListener(floater, "Inventory.SetSearchBy");
 }
 
 void init_inventory_panel_actions(LLInventoryPanel *panel)
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index dc1e0a1..19a5ade 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -111,6 +111,8 @@ void remove_inventory_category_from_avatar(LLInventoryCategory* category);
 void remove_inventory_category_from_avatar_step2( BOOL proceed, void* userdata);
 void move_task_inventory_callback(S32 option, void* user_data);
 void confirm_replace_attachment_rez(S32 option, void* user_data);
+void wear_attachments_on_avatar(const std::set<LLUUID>& item_ids, BOOL remove);
+void wear_attachments_on_avatar(const LLInventoryModel::item_array_t& items, BOOL remove);
 
 std::string ICON_NAME[ICON_NAME_COUNT] =
 {
@@ -3740,6 +3742,31 @@ private:
         bool mAppend;
 };
 
+class LLWearAttachmentsCallback : public LLInventoryCallback
+{
+public:
+        LLWearAttachmentsCallback(bool append) : mAppend(append) {}
+        void fire(const LLUUID& item_id)
+        {
+                mItemIDs.insert(item_id);
+        }
+protected:
+        ~LLWearAttachmentsCallback()
+        {
+                if( LLInventoryCallbackManager::is_instantiated() )
+                {
+                        wear_attachments_on_avatar(mItemIDs, mAppend);
+                }
+                else
+                {
+                        llwarns << "Dropping unhandled LLWearAttachments" << llendl;
+                }
+        }
+private:
+        std::set<LLUUID> mItemIDs;
+        bool mAppend;
+};
+
 void LLOutfitObserver::done()
 {
         // We now have an outfit ready to be copied to agent inventory. Do
@@ -4109,67 +4136,7 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
                 if( obj_count > 0 )
                 {
                         // We've found some attachements.  Add these.
-
-                        LLVOAvatar* avatar = gAgent.getAvatarObject();
-                        if( avatar )
-                        {
-                                // Build a compound message to send all the objects that need to be rezzed.
-
-                                // Limit number of packets to send
-                                const S32 MAX_PACKETS_TO_SEND = 10;
-                                const S32 OBJECTS_PER_PACKET = 4;
-                                const S32 MAX_OBJECTS_TO_SEND = MAX_PACKETS_TO_SEND * OBJECTS_PER_PACKET;
-                                if( obj_count > MAX_OBJECTS_TO_SEND )
-                                {
-                                        obj_count = MAX_OBJECTS_TO_SEND;
-                                }
-                                
-                                // Create an id to keep the parts of the compound message together
-                                LLUUID compound_msg_id;
-                                compound_msg_id.generate();
-                                LLMessageSystem* msg = gMessageSystem;
-
-                                for(i = 0; i < obj_count; ++i)
-                                {
-                                        if( 0 == (i % OBJECTS_PER_PACKET) )
-                                        {
-                                                // Start a new message chunk
-                                                msg->newMessageFast(_PREHASH_RezMultipleAttachmentsFromInv);
-                                                msg->nextBlockFast(_PREHASH_AgentData);
-                                                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-                                                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                                                msg->nextBlockFast(_PREHASH_HeaderData);
-                                                msg->addUUIDFast(_PREHASH_CompoundMsgID, compound_msg_id );
-                                                msg->addU8Fast(_PREHASH_TotalObjects, obj_count );
-//                                              msg->addBOOLFast(_PREHASH_FirstDetachAll, !wear_info->mAppend );
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Added: RLVa-0.2.2a
-                                                // This really should just *always* be FALSE since TRUE can result in loss of the current asset state
-                                                msg->addBOOLFast(_PREHASH_FirstDetachAll, (!wear_info->mAppend) && (!gRlvHandler.hasLockedAttachment()) );
-// [/RLVa:KB]
-                                        }
-
-                                        LLInventoryItem* item = obj_item_array.get(i);
-                                        msg->nextBlockFast(_PREHASH_ObjectData );
-                                        msg->addUUIDFast(_PREHASH_ItemID, item->getUUID() );
-                                        msg->addUUIDFast(_PREHASH_OwnerID, item->getPermissions().getOwner());
-//                                      msg->addU8Fast(_PREHASH_AttachmentPt, 0 );      // Wear at the previous or default attachment point
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Added: RLVa-0.2.2a
-                                        msg->addU8Fast(_PREHASH_AttachmentPt, 
-                                                ( (!rlv_handler_t::isEnabled()) || (RlvSettings::getEnableWear()) || (!gRlvHandler.hasLockedAttachment()) )
-                                                        ? 0
-                                                        : gRlvHandler.getAttachPointIndex(gRlvHandler.getAttachPoint(item, true)));
-// [/RLVa:KB]
-                                        pack_permissions_slam(msg, item->getFlags(), item->getPermissions());
-                                        msg->addStringFast(_PREHASH_Name, item->getName());
-                                        msg->addStringFast(_PREHASH_Description, item->getDescription());
-
-                                        if( (i+1 == obj_count) || ((OBJECTS_PER_PACKET-1) == (i % OBJECTS_PER_PACKET)) )
-                                        {
-                                                // End of message chunk
-                                                msg->sendReliable( gAgent.getRegion()->getHost() );
-                                        }
-                                }
-                        }
+                        wear_attachments_on_avatar(obj_item_array, !wear_info->mAppend);
                 }
         }
         delete wear_info;
@@ -4260,6 +4227,109 @@ void wear_inventory_category_on_avatar_step3(LLWearableHoldingPattern* holder, B
         dec_busy_count();
 }
 
+void wear_attachments_on_avatar(const std::set<LLUUID>& item_ids, BOOL remove)
+{
+        // NOTE: the inventory items can reside in the user's inventory, the library, or any combination of the two
+
+        LLInventoryModel::item_array_t items;
+        LLPointer<LLInventoryCallback> cb;
+
+        for (std::set<LLUUID>::const_iterator it = item_ids.begin(); it != item_ids.end(); ++it)
+        {
+                LLViewerInventoryItem* item = gInventory.getItem(*it);
+                if ( (item) && (LLAssetType::AT_OBJECT == item->getType()) )
+                {
+                        if ( (gInventory.isObjectDescendentOf(*it, gAgent.getInventoryRootID())) )
+                        {
+                                items.put(item);
+                        }
+                        else if ( (item->isComplete()) )
+                        {
+                                if (cb.isNull())
+                                        cb = new LLWearAttachmentsCallback(remove);
+                                copy_inventory_item(gAgent.getID(), item->getPermissions().getOwner(), item->getUUID(), LLUUID::null, std::string(), cb);
+                        }
+                }
+        }
+
+        wear_attachments_on_avatar(items, remove);
+}
+
+void wear_attachments_on_avatar(const LLInventoryModel::item_array_t& items, BOOL remove)
+{
+        // NOTE: all inventory items must reside in the user's inventory
+
+        LLVOAvatar* avatarp = gAgent.getAvatarObject();
+        if(!avatarp)
+        {
+                llwarns << "No avatar found." << llendl;
+                return;
+        }
+
+        // Build a compound message to send all the objects that need to be rezzed.
+
+        // Limit number of packets to send
+        const S32 MAX_PACKETS_TO_SEND = 10;
+        const S32 OBJECTS_PER_PACKET = 4;
+        const S32 MAX_OBJECTS_TO_SEND = MAX_PACKETS_TO_SEND * OBJECTS_PER_PACKET;
+
+        S32 count = items.count();
+        if ( !count )
+        {
+                return;
+        }
+        else if ( count > MAX_OBJECTS_TO_SEND )
+        {
+                count = MAX_OBJECTS_TO_SEND;
+        }
+        
+        // Create an id to keep the parts of the compound message together
+        LLUUID compound_msg_id;
+        compound_msg_id.generate();
+        LLMessageSystem* msg = gMessageSystem;
+
+        for(S32 i = 0; i < count; ++i)
+        {
+                if( 0 == (i % OBJECTS_PER_PACKET) )
+                {
+                        // Start a new message chunk
+                        msg->newMessageFast(_PREHASH_RezMultipleAttachmentsFromInv);
+                        msg->nextBlockFast(_PREHASH_AgentData);
+                        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                        msg->nextBlockFast(_PREHASH_HeaderData);
+                        msg->addUUIDFast(_PREHASH_CompoundMsgID, compound_msg_id );
+                        msg->addU8Fast(_PREHASH_TotalObjects, count );
+//                      msg->addBOOLFast(_PREHASH_FirstDetachAll, remove );
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Added: RLVa-0.2.2a
+                                // This really should just *always* be FALSE since TRUE can result in loss of the current asset state
+                                msg->addBOOLFast(_PREHASH_FirstDetachAll, remove && (!gRlvHandler.hasLockedAttachment()) );
+// [/RLVa:KB]
+                        }
+
+                LLInventoryItem* item = items.get(i);
+                msg->nextBlockFast(_PREHASH_ObjectData );
+                msg->addUUIDFast(_PREHASH_ItemID, item->getUUID() );
+                msg->addUUIDFast(_PREHASH_OwnerID, item->getPermissions().getOwner());
+//              msg->addU8Fast(_PREHASH_AttachmentPt, 0 );      // Wear at the previous or default attachment point
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Added: RLVa-0.2.2a
+                        msg->addU8Fast(_PREHASH_AttachmentPt, 
+                                ( (!rlv_handler_t::isEnabled()) || (RlvSettings::getEnableWear()) || (!gRlvHandler.hasLockedAttachment()) )
+                                        ? 0
+                                        : gRlvHandler.getAttachPointIndex(gRlvHandler.getAttachPoint(item, true)));
+// [/RLVa:KB]
+                pack_permissions_slam(msg, item->getFlags(), item->getPermissions());
+                msg->addStringFast(_PREHASH_Name, item->getName());
+                msg->addStringFast(_PREHASH_Description, item->getDescription());
+
+                if( (i+1 == count) || ((OBJECTS_PER_PACKET-1) == (i % OBJECTS_PER_PACKET)) )
+                {
+                        // End of message chunk
+                        msg->sendReliable( gAgent.getRegion()->getHost() );
+                }
+        }
+}
+
 void remove_inventory_category_from_avatar( LLInventoryCategory* category )
 {
         if(!category) return;
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index e662058..324e36a 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -1499,6 +1499,8 @@ void LLInventoryModel::stopBackgroundFetch()
 //static 
 void LLInventoryModel::backgroundFetch(void*)
 {
+        if (gDisconnected)
+                return;
         if (sBackgroundFetchActive && gAgent.getRegion())
         {
                 //If we'll be using the capability, we'll be sending batches and the background thing isn't as important.
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index 8e8e894..a8d5045 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -521,6 +521,15 @@ void LLInventoryView::init(LLInventoryModel* inventory)
         addBoolControl("Inventory.FoldersAlwaysByName", sort_folders_by_name );
         addBoolControl("Inventory.SystemFoldersToTop", sort_system_folders_to_top );
 
+        //Search Controls
+        U32 search_type = gSavedSettings.getU32("InventorySearchType");
+        BOOL search_by_name = (search_type == 0);
+
+        addBoolControl("Inventory.SearchByName", search_by_name);
+        addBoolControl("Inventory.SearchByCreator", !search_by_name);
+
+        addBoolControl("Inventory.SearchByAll", !search_by_name);
+
         mSavedFolderState = new LLSaveFolderState();
         mSavedFolderState->setApply(FALSE);
 
diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp
index 10cb0c3..5a67937 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -69,6 +69,8 @@ const F32 SNAP_GUIDE_SCREEN_LENGTH = 0.7f;
 const F32 SELECTED_MANIPULATOR_SCALE = 1.2f;
 const F32 MANIPULATOR_SCALE_HALF_LIFE = 0.07f;
 const S32 NUM_MANIPULATORS = 14;
+const F32 DEFAULT_LL_MAX_PRIM_SCALE = 10.f; 
+const F32 DEFAULT_OPENSIM_MAX_PRIM_SCALE = 128.f;
 
 const LLManip::EManipPart MANIPULATOR_IDS[NUM_MANIPULATORS] = 
 {
@@ -173,6 +175,7 @@ LLManipScale::LLManipScale( LLToolComposite* composite )
         mScaledBoxHandleSize( 1.f ),
         mLastMouseX( -1 ),
         mLastMouseY( -1 ),
+        mMaxPrimSize(0.f),
         mSendUpdateOnMouseUp( FALSE ),
         mLastUpdateFlags( 0 ),
         mScaleSnapUnit1(1.f),
@@ -201,6 +204,7 @@ void LLManipScale::render()
         LLGLDepthTest gls_depth(GL_TRUE);
         LLGLEnable gl_blend(GL_BLEND);
         LLGLEnable gls_alpha_test(GL_ALPHA_TEST);
+        mMaxPrimSize = gSavedSettings.getBOOL("LoggedIntoOpenSim") ? DEFAULT_OPENSIM_MAX_PRIM_SCALE : DEFAULT_LL_MAX_PRIM_SCALE;
         
         if( canAffectSelection() )
         {
@@ -952,8 +956,8 @@ void LLManipScale::dragCorner( S32 x, S32 y )
                 mInSnapRegime = FALSE;
         }
 
-        F32 max_scale_factor = DEFAULT_MAX_PRIM_SCALE / MIN_PRIM_SCALE;
-        F32 min_scale_factor = MIN_PRIM_SCALE / DEFAULT_MAX_PRIM_SCALE;
+        F32 max_scale_factor = mMaxPrimSize / MIN_PRIM_SCALE;
+        F32 min_scale_factor = MIN_PRIM_SCALE / mMaxPrimSize;
 
         // find max and min scale factors that will make biggest object hit max absolute scale and smallest object hit min absolute scale
         for (LLObjectSelection::iterator iter = mObjectSelection->begin();
@@ -965,7 +969,7 @@ void LLManipScale::dragCorner( S32 x, S32 y )
                 {
                         const LLVector3& scale = selectNode->mSavedScale;
 
-                        F32 cur_max_scale_factor = llmin( DEFAULT_MAX_PRIM_SCALE / scale.mV[VX], DEFAULT_MAX_PRIM_SCALE / scale.mV[VY], DEFAULT_MAX_PRIM_SCALE / scale.mV[VZ] );
+                        F32 cur_max_scale_factor = llmin( mMaxPrimSize / scale.mV[VX], mMaxPrimSize / scale.mV[VY], mMaxPrimSize / scale.mV[VZ] );
                         max_scale_factor = llmin( max_scale_factor, cur_max_scale_factor );
 
                         F32 cur_min_scale_factor = llmax( MIN_PRIM_SCALE / scale.mV[VX], MIN_PRIM_SCALE / scale.mV[VY], MIN_PRIM_SCALE / scale.mV[VZ] );
@@ -1262,7 +1266,7 @@ void LLManipScale::stretchFace( const LLVector3& drag_start_agent, const LLVecto
 
                         F32 denom = axis * dir_local;
                         F32 desired_delta_size  = is_approx_zero(denom) ? 0.f : (delta_local_mag / denom);  // in meters
-                        F32 desired_scale               = llclamp(selectNode->mSavedScale.mV[axis_index] + desired_delta_size, MIN_PRIM_SCALE, DEFAULT_MAX_PRIM_SCALE);
+                        F32 desired_scale               = llclamp(selectNode->mSavedScale.mV[axis_index] + desired_delta_size, MIN_PRIM_SCALE, mMaxPrimSize);
                         // propagate scale constraint back to position offset
                         desired_delta_size              = desired_scale - selectNode->mSavedScale.mV[axis_index]; // propagate constraint back to position
 
@@ -1962,7 +1966,7 @@ F32		LLManipScale::partToMaxScale( S32 part, const LLBBox &bbox ) const
                         max_extent = bbox_extents.mV[i];
                 }
         }
-        max_scale_factor = bbox_extents.magVec() * DEFAULT_MAX_PRIM_SCALE / max_extent;
+        max_scale_factor = bbox_extents.magVec() * mMaxPrimSize / max_extent;
 
         if (getUniform())
         {
@@ -1977,7 +1981,7 @@ F32		LLManipScale::partToMinScale( S32 part, const LLBBox &bbox ) const
 {
         LLVector3 bbox_extents = unitVectorToLocalBBoxExtent( partToUnitVector( part ), bbox );
         bbox_extents.abs();
-        F32 min_extent = DEFAULT_MAX_PRIM_SCALE;
+        F32 min_extent = mMaxPrimSize;
         for (U32 i = VX; i <= VZ; i++)
         {
                 if (bbox_extents.mV[i] > 0.f && bbox_extents.mV[i] < min_extent)
@@ -2052,3 +2056,13 @@ BOOL LLManipScale::canAffectSelection()
         }
         return can_scale;
 }
+
+//static
+F32 LLManipScale::getMaxPrimSize()
+{
+        if (gSavedSettings.getBOOL("LoggedIntoOpenSim"))
+        {
+                return DEFAULT_OPENSIM_MAX_PRIM_SCALE;
+        }
+        return DEFAULT_LL_MAX_PRIM_SCALE;
+}
diff --git a/linden/indra/newview/llmanipscale.h b/linden/indra/newview/llmanipscale.h
index 98d8c63..c60cb69 100644
--- a/linden/indra/newview/llmanipscale.h
+++ b/linden/indra/newview/llmanipscale.h
@@ -88,6 +88,8 @@ public:
         static void             setShowAxes( BOOL b );
         static BOOL             getShowAxes();
 
+        static F32              getMaxPrimSize();
+
 private:
         void                    renderCorners( const LLBBox& local_bbox );
         void                    renderFaces( const LLBBox& local_bbox );
@@ -165,6 +167,7 @@ private:
         F32                             mScaleSnapValue;
         BOOL                    mInSnapRegime;
         F32*                    mManipulatorScales;
+        F32                             mMaxPrimSize;
 };
 
 #endif  // LL_MANIPSCALE_H
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 8f5d90d..9ef56c1 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -45,6 +45,7 @@
 #include "llcolorscheme.h"
 #include "llviewercontrol.h"
 #include "llfloateravatarinfo.h"
+#include "llfloatermap.h"
 #include "llfloaterworldmap.h"
 #include "llframetimer.h"
 #include "llmutelist.h"
@@ -69,13 +70,15 @@
 #include "llglheaders.h"
 
 const F32 MAP_SCALE_MIN = 32;
-const F32 MAP_SCALE_MID = 172;
-const F32 MAP_SCALE_MAX = 512;
+const F32 MAP_SCALE_MID = 1024;
+const F32 MAP_SCALE_MAX = 4096;
 const F32 MAP_SCALE_INCREMENT = 16;
-const F32 MAP_MIN_PICK_DIST = 4;
+const F32 MAP_SCALE_ZOOM_FACTOR = 1.25f;                        // Zoom in factor per click of the scroll wheel (25%)
 const F32 MAP_MINOR_DIR_THRESHOLD = 0.08f;
+const F32 MIN_DOT_RADIUS = 3.5f;
+const F32 DOT_SCALE = 0.75f;
+const F32 MIN_PICK_SCALE = 2.f;
 const S32 SLOP = 2;
-
 const S32 TRACKING_RADIUS = 3;
 
 LLNetMap::LLNetMap(const std::string& name) :
@@ -91,6 +94,7 @@ LLNetMap::LLNetMap(const std::string& name) :
 {
         mScale = gSavedSettings.getF32("MiniMapScale");
         mPixelsPerMeter = mScale / LLWorld::getInstance()->getRegionWidthInMeters();
+        mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS);
 
         mObjectImageCenterGlobal = gAgent.getCameraPositionGlobal();
         
@@ -98,6 +102,8 @@ LLNetMap::LLNetMap(const std::string& name) :
         (new LLScaleMap())->registerListener(this, "MiniMap.ZoomLevel");
         (new LLCenterMap())->registerListener(this, "MiniMap.Center");
         (new LLCheckCenterMap())->registerListener(this, "MiniMap.CheckCenter");
+        (new LLRotateMap())->registerListener(this, "MiniMap.Rotate");
+        (new LLCheckRotateMap())->registerListener(this, "MiniMap.CheckRotate");
         (new LLShowWorldMap())->registerListener(this, "MiniMap.ShowWorldMap");
         (new LLStopTracking())->registerListener(this, "MiniMap.StopTracking");
         (new LLEnableTracking())->registerListener(this, "MiniMap.EnableTracking");
@@ -117,6 +123,11 @@ LLNetMap::LLNetMap(const std::string& name) :
         mPopupMenuHandle = menu->getHandle();
 }
 
+BOOL LLNetMap::postBuild()
+{
+        return TRUE;
+}
+
 LLNetMap::~LLNetMap()
 {
 }
@@ -143,6 +154,7 @@ void LLNetMap::setScale( F32 scale )
         }
 
         mPixelsPerMeter = mScale / LLWorld::getInstance()->getRegionWidthInMeters();
+        mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS);
 
         mUpdateNow = TRUE;
 }
@@ -325,12 +337,15 @@ void LLNetMap::draw()
                 LLUI::getCursorPositionLocal(this, &local_mouse_x, &local_mouse_y);
                 mClosestAgentToCursor.setNull();
                 F32 closest_dist = F32_MAX;
+                F32 min_pick_dist = mDotRadius * MIN_PICK_SCALE; 
 
                 // Draw avatars
                 LLColor4 avatar_color = gColors.getColor( "MapAvatar" );
                 LLColor4 friend_color = gColors.getColor( "MapFriend" );
                 LLColor4 muted_color = gColors.getColor( "MapMuted" );
+                LLColor4 selected_color = gColors.getColor( "MapSelected" );
                 LLColor4 glyph_color;
+                F32 glyph_radius;
 
                 std::vector<LLUUID> avatar_ids;
                 std::vector<LLVector3d> positions;
@@ -340,20 +355,38 @@ void LLNetMap::draw()
                         // TODO: it'd be very cool to draw these in sorted order from lowest Z to highest.
                         // just be careful to sort the avatar IDs along with the positions. -MG
                         pos_map = globalPosToView(positions[i], rotate_map);
-
-                        // Show them muted even if they're friends
-                        if (LLMuteList::getInstance()->isMuted(avatar_ids[i]))
+                        
+                        if (LLFloaterMap::getSelected() == avatar_ids[i])
                         {
-                                glyph_color = muted_color;
+                                glyph_radius = mDotRadius * 1.7f;
+                                glyph_color = selected_color;
                         }
-                        else if (is_agent_friend(avatar_ids[i]))
+                        else
                         {
-                                glyph_color = friend_color;
+                                glyph_radius = mDotRadius;
+                                // Show them muted even if they're friends
+                                if (LLMuteList::getInstance()->isMuted(avatar_ids[i]))
+                                {
+                                        glyph_color = muted_color;
+                                }
+                                else if (is_agent_friend(avatar_ids[i]))
+                                {
+                                        glyph_color = friend_color;
+                                }
+                                else
+                                {
+                                        glyph_color = avatar_color;
+                                }
                         }
-                        else
+
+// [RLVa:KB]
+                        if ( rlv_handler_t::isEnabled() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) )
                         {
+                                // User is not allowed to see who it is, or even if it's a friend,
+                                // due to RLV settings.
                                 glyph_color = avatar_color;
                         }
+// [/RLVa:KB]
 
 // [RLVa:KB]
                         if ( !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) )
@@ -368,10 +401,11 @@ void LLNetMap::draw()
                         LLWorldMapView::drawAvatar(
                                 pos_map.mV[VX], pos_map.mV[VY], 
                                 glyph_color, 
-                                pos_map.mV[VZ]);
+                                pos_map.mV[VZ],
+                                glyph_radius);
 
                         F32     dist_to_cursor = dist_vec(LLVector2(pos_map.mV[VX], pos_map.mV[VY]), LLVector2(local_mouse_x,local_mouse_y));
-                        if(dist_to_cursor < MAP_MIN_PICK_DIST && dist_to_cursor < closest_dist)
+                        if(dist_to_cursor < min_pick_dist && dist_to_cursor < closest_dist)
                         {
                                 closest_dist = dist_to_cursor;
                                 mClosestAgentToCursor = avatar_ids[i];
@@ -400,10 +434,13 @@ void LLNetMap::draw()
                 // Draw dot for self avatar position
                 pos_global = gAgent.getPositionGlobal();
                 pos_map = globalPosToView(pos_global, rotate_map);
-                LLUIImagePtr you = LLWorldMapView::sAvatarYouSmallImage;
+                LLUIImagePtr you = LLWorldMapView::sAvatarYouLargeImage;
+                S32 dot_width = llround(mDotRadius * 2.f);
                 you->draw(
-                        llround(pos_map.mV[VX]) - you->getWidth()/2, 
-                        llround(pos_map.mV[VY]) - you->getHeight()/2);
+                        llround(pos_map.mV[VX] - mDotRadius),
+                        llround(pos_map.mV[VY] - mDotRadius),
+                        dot_width,
+                        dot_width);
 
                 // Draw frustum
                 F32 meters_to_pixels = mScale/ LLWorld::getInstance()->getRegionWidthInMeters();
@@ -460,6 +497,8 @@ void LLNetMap::draw()
         setDirectionPos( getChild<LLTextBox>("se_label"), rotation + F_PI + F_PI_BY_TWO + F_PI_BY_TWO / 2);
 
         LLView::draw();
+
+        LLFloaterMap::updateRadar();
 }
 
 void LLNetMap::reshape(S32 width, S32 height, BOOL called_from_parent)
@@ -542,8 +581,12 @@ LLVector3d LLNetMap::viewPosToGlobal( S32 x, S32 y, BOOL rotated )
 
 BOOL LLNetMap::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-        // note that clicks are reversed from what you'd think
-        setScale(llclamp(mScale - clicks*MAP_SCALE_INCREMENT, MAP_SCALE_MIN, MAP_SCALE_MAX));
+        // note that clicks are reversed from what you'd think: i.e. > 0  means zoom out, < 0 means zoom in
+        F32 scale = mScale;
+        
+        scale *= pow(MAP_SCALE_ZOOM_FACTOR, -clicks);
+        setScale(llclamp(scale, MAP_SCALE_MIN, MAP_SCALE_MAX));
+
         return TRUE;
 }
 
@@ -562,7 +605,7 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
                 if(mClosestAgentToCursor.notNull() && gCacheName->getFullName(mClosestAgentToCursor, fullname))
                 {
 // [RLVa:KB]
-                        if ( !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) )
+                        if ( rlv_handler_t::isEnabled() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) )
                         {
                                 // User is not allowed to see who it is, due to RLV settings.
                                 msg.append(rlv_handler_t::cstrHidden);
@@ -576,7 +619,7 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
                 }
                 
 // [RLVa:KB]
-                if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+                if (rlv_handler_t::isEnabled() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
                 {
                         // User is not allowed to see where they are, due to RLV settings.
                         msg.append( rlv_handler_t::cstrHidden ); 
@@ -922,6 +965,22 @@ bool LLNetMap::LLScaleMap::handleEvent(LLPointer<LLEvent> event, const LLSD& use
         return true;
 }
 
+bool LLNetMap::LLRotateMap::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+{
+        BOOL rotate = gSavedSettings.getBOOL("MiniMapRotate");
+        gSavedSettings.setBOOL("MiniMapRotate", !rotate);
+
+        return true;
+}
+
+bool LLNetMap::LLCheckRotateMap::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+{
+        LLNetMap *self = mPtr;
+        BOOL enabled = gSavedSettings.getBOOL("MiniMapRotate");
+        self->findControl(userdata["control"].asString())->setValue(enabled);
+        return true;
+}
+
 bool LLNetMap::LLCenterMap::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 {
         S32 center = userdata.asInteger();
diff --git a/linden/indra/newview/llnetmap.h b/linden/indra/newview/llnetmap.h
index ef046d8..800b825 100644
--- a/linden/indra/newview/llnetmap.h
+++ b/linden/indra/newview/llnetmap.h
@@ -52,6 +52,8 @@ class LLNetMap : public LLPanel
 {
 public:
         LLNetMap(const std::string& name);
+
+        virtual BOOL postBuild();
         virtual ~LLNetMap();
 
         virtual void    draw();
@@ -93,7 +95,8 @@ private:
         F32                             mScale;                                 // Size of a region in pixels
         F32                             mPixelsPerMeter;                // world meters to map pixels
         F32                             mObjectMapTPM;                  // texels per meter on map
-        F32                             mObjectMapPixels;               // Width of object map in pixels;
+        F32                             mObjectMapPixels;               // Width of object map in pixels
+        F32                             mDotRadius;                             // Size of avatar markers
         F32                             mTargetPanX;
         F32                             mTargetPanY;
         F32                             mCurPanX;
@@ -111,8 +114,8 @@ private:
         LLPointer<LLImageGL>    mObjectImagep;
 
 private:
-        LLUUID                  mClosestAgentToCursor;
-        LLUUID                  mClosestAgentAtLastRightClick;
+        LLUUID                          mClosestAgentToCursor;
+        LLUUID                          mClosestAgentAtLastRightClick;
 
         static BOOL             sRotateMap;
         static LLNetMap*        sInstance;
@@ -140,6 +143,18 @@ private:
                 /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
         };
 
+        class LLRotateMap : public LLMemberListener<LLNetMap>
+        {
+        public:
+                /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
+        };
+
+        class LLCheckRotateMap : public LLMemberListener<LLNetMap>
+        {
+        public:
+                /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
+        };
+
         class LLShowWorldMap : public LLMemberListener<LLNetMap>
         {
         public:
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 91ac440..c1a2354 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -41,6 +41,7 @@
 #include "llagent.h"
 #include "llbutton.h"
 #include "llchatbar.h"
+#include "llfloaterchat.h"
 #include "llfocusmgr.h"
 #include "llimview.h"
 #include "llmediaremotectrl.h"
@@ -62,6 +63,7 @@
 #include "llvoavatar.h"
 #include "llvoiceremotectrl.h"
 #include "llwebbrowserctrl.h"
+#include "llwindlightremotectrl.h"
 #include "llselectmgr.h"
 
 //
@@ -72,6 +74,53 @@ LLOverlayBar *gOverlayBar = NULL;
 
 extern S32 MENU_BAR_HEIGHT;
 
+
+class LLTitleObserver
+        :       public LLMediaObserver
+{
+public:
+        void init(std::string url);
+        /*virtual*/ void onMediaTitleChange(const EventType& event_in);
+private:
+        LLMediaBase* mMediaSource;
+};
+
+static LLTitleObserver sTitleObserver;
+
+static LLRegisterWidget<LLMediaRemoteCtrl> r("media_remote");
+
+void LLTitleObserver::init(std::string url)
+{
+
+        if (!gAudiop)
+        {
+                return;
+        }
+
+        mMediaSource = gAudiop->getStreamMedia(); // LLViewerMedia::getSource();
+
+        if ( mMediaSource )
+        {
+                mMediaSource->addObserver(this);
+        }
+}
+
+//virtual
+void LLTitleObserver::onMediaTitleChange(const EventType& event_in)
+{
+        if ( !gSavedSettings.getBOOL("ShowStreamTitle") )
+        {
+                return;
+        }
+
+        LLChat chat;
+        //TODO: set this in XUI
+        std::string playing_msg = "Playing: " + event_in.getStringValue();
+        chat.mText = playing_msg;
+        LLFloaterChat::addChat(chat, FALSE, FALSE);
+}
+
+
 //
 // Functions
 //
@@ -92,6 +141,13 @@ void* LLOverlayBar::createVoiceRemote(void* userdata)
         return self->mVoiceRemote;
 }
 
+void* LLOverlayBar::createWindlightRemote(void* userdata)
+{
+        LLOverlayBar *self = (LLOverlayBar*)userdata;   
+        self->mWindlightRemote = new LLWindlightRemoteCtrl();
+        return self->mWindlightRemote;
+}
+
 void* LLOverlayBar::createChatBar(void* userdata)
 {
         gChatBar = new LLChatBar();
@@ -102,6 +158,7 @@ LLOverlayBar::LLOverlayBar()
         :       LLPanel(),
                 mMediaRemote(NULL),
                 mVoiceRemote(NULL),
+                mWindlightRemote(NULL),
                 mMusicState(STOPPED),
                 mOriginalIMLabel("")
 {
@@ -113,6 +170,7 @@ LLOverlayBar::LLOverlayBar()
         LLCallbackMap::map_t factory_map;
         factory_map["media_remote"] = LLCallbackMap(LLOverlayBar::createMediaRemote, this);
         factory_map["voice_remote"] = LLCallbackMap(LLOverlayBar::createVoiceRemote, this);
+        factory_map["windlight_remote"] = LLCallbackMap(LLOverlayBar::createWindlightRemote, this);
         factory_map["chat_bar"] = LLCallbackMap(LLOverlayBar::createChatBar, this);
         
         LLUICtrlFactory::getInstance()->buildPanel(this, "panel_overlaybar.xml", &factory_map);
@@ -272,6 +330,7 @@ void LLOverlayBar::refresh()
         }
 
 
+        moveChildToBackOfTabGroup(mWindlightRemote);
         moveChildToBackOfTabGroup(mMediaRemote);
         moveChildToBackOfTabGroup(mVoiceRemote);
 
@@ -280,6 +339,7 @@ void LLOverlayBar::refresh()
         {
                 childSetVisible("media_remote_container", FALSE);
                 childSetVisible("voice_remote_container", FALSE);
+                childSetVisible("windlight_remote_container", FALSE);
                 childSetVisible("state_buttons", FALSE);
         }
         else
@@ -287,6 +347,7 @@ void LLOverlayBar::refresh()
                 // update "remotes"
                 childSetVisible("media_remote_container", TRUE);
                 childSetVisible("voice_remote_container", LLVoiceClient::voiceEnabled());
+                childSetVisible("windlight_remote_container", gSavedSettings.getBOOL("EnableWindlightRemote"));
                 childSetVisible("state_buttons", TRUE);
         }
 
@@ -416,6 +477,7 @@ void LLOverlayBar::toggleMusicPlay(void*)
         //                      if ( gAudiop->isInternetStreamPlaying() == 0 )
                                 {
                                         gAudiop->startInternetStream(parcel->getMusicURL());
+                                        sTitleObserver.init(parcel->getMusicURL());
                                 }
                         }
                 }
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h
index 52a469a..140fabf 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -40,6 +40,7 @@ extern S32 STATUS_BAR_HEIGHT;
 class LLButton;
 class LLLineEditor;
 class LLMediaRemoteCtrl;
+
 class LLMessageSystem;
 class LLTextBox;
 class LLTextEditor;
@@ -49,6 +50,7 @@ class LLFrameTimer;
 class LLStatGraph;
 class LLSlider;
 class LLVoiceRemoteCtrl;
+class LLWindlightRemoteCtrl;
 
 class LLOverlayBar
 :       public LLPanel
@@ -88,13 +90,15 @@ public:
 protected:      
         static void* createMediaRemote(void* userdata);
         static void* createVoiceRemote(void* userdata);
+        static void* createWindlightRemote(void* userdata);
         static void* createChatBar(void* userdata);
 
         void enableMediaButtons();
 
 protected:
-        LLMediaRemoteCtrl*      mMediaRemote;
-        LLVoiceRemoteCtrl*      mVoiceRemote;
+        LLMediaRemoteCtrl*              mMediaRemote;
+        LLVoiceRemoteCtrl*              mVoiceRemote;
+        LLWindlightRemoteCtrl*  mWindlightRemote;
         bool                            mBuilt; // dialog constructed yet?
         S32                                     mMusicState;
         std::string                     mOriginalIMLabel;
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 8c367fa..e101ea2 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -51,6 +51,7 @@
 
 #include "llfloaterfriends.h"
 #include "llfloatergroupinfo.h"
+#include "llfloatergroups.h"
 #include "llfloaterworldmap.h"
 #include "llfloatermute.h"
 #include "llfloateravatarinfo.h"
@@ -86,6 +87,7 @@
 std::list<LLPanelAvatar*> LLPanelAvatar::sAllPanels;
 BOOL LLPanelAvatar::sAllowFirstLife = FALSE;
 
+extern void callback_invite_to_group(LLUUID group_id, void *user_data);
 extern void handle_lure(const LLUUID& invitee);
 extern void handle_pay_by_id(const LLUUID& payee);
 
@@ -428,6 +430,7 @@ BOOL LLPanelAvatarSecondLife::postBuild(void)
 
         childSetAction("Find on Map", LLPanelAvatar::onClickTrack, getPanelAvatar());
         childSetAction("Instant Message...", LLPanelAvatar::onClickIM, getPanelAvatar());
+        childSetAction("Invite to Group...", LLPanelAvatar::onClickGroupInvite, getPanelAvatar());
         
         childSetAction("Add Friend...", LLPanelAvatar::onClickAddFriend, getPanelAvatar());
         childSetAction("Pay...", LLPanelAvatar::onClickPay, getPanelAvatar());
@@ -1433,6 +1436,8 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
                         }
                         childSetVisible("Instant Message...",FALSE);
                         childSetEnabled("Instant Message...",FALSE);
+                        childSetVisible("Invite to Group...",FALSE);
+                        childSetEnabled("Invite to Group...",FALSE);
                         childSetVisible("Mute",FALSE);
                         childSetEnabled("Mute",FALSE);
                         childSetVisible("Offer Teleport...",FALSE);
@@ -1445,6 +1450,14 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
                         childSetEnabled("Add Friend...",FALSE);
                         childSetVisible("Pay...",FALSE);
                         childSetEnabled("Pay...",FALSE);
+                        childSetVisible("Kick",FALSE);
+                        childSetEnabled("Kick",FALSE);
+                        childSetVisible("Freeze",FALSE);
+                        childSetEnabled("Freeze",FALSE);
+                        childSetVisible("Unfreeze",FALSE);
+                        childSetEnabled("Unfreeze",FALSE);
+                        childSetVisible("csr_btn", FALSE);
+                        childSetEnabled("csr_btn", FALSE);
                 }
                 else
                 {
@@ -1456,6 +1469,8 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
 
                         childSetVisible("Instant Message...",TRUE);
                         childSetEnabled("Instant Message...",FALSE);
+                        childSetVisible("Invite to Group...",TRUE);
+                        childSetEnabled("Invite to Group...",FALSE);
                         childSetVisible("Mute",TRUE);
                         childSetEnabled("Mute",FALSE);
 
@@ -1482,20 +1497,20 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
                         childSetEnabled("Add Friend...", !avatar_is_friend);
                         childSetVisible("Pay...",TRUE);
                         childSetEnabled("Pay...",FALSE);
+
+                        BOOL is_god = FALSE;
+                        if (gAgent.isGodlike()) is_god = TRUE;
+                        
+                        childSetVisible("Kick", is_god);
+                        childSetEnabled("Kick", is_god);
+                        childSetVisible("Freeze", is_god);
+                        childSetEnabled("Freeze", is_god);
+                        childSetVisible("Unfreeze", is_god);
+                        childSetEnabled("Unfreeze", is_god);
+                        childSetVisible("csr_btn", is_god);
+                        childSetEnabled("csr_btn", is_god);
                 }
         }
-        
-        BOOL is_god = FALSE;
-        if (gAgent.isGodlike()) is_god = TRUE;
-        
-        childSetVisible("Kick", is_god);
-        childSetEnabled("Kick", is_god);
-        childSetVisible("Freeze", is_god);
-        childSetEnabled("Freeze", is_god);
-        childSetVisible("Unfreeze", is_god);
-        childSetEnabled("Unfreeze", is_god);
-        childSetVisible("csr_btn", is_god);
-        childSetEnabled("csr_btn", is_god);
 }
 
 
@@ -1538,9 +1553,18 @@ void LLPanelAvatar::resetGroupList()
                                 LLSD row;
 
                                 row["id"] = id ;
-                                row["columns"][0]["value"] = group_string;
                                 row["columns"][0]["font"] = "SANSSERIF_SMALL";
                                 row["columns"][0]["width"] = 0;
+                                if (group_data.mListInProfile)
+                                {
+                                        row["columns"][0]["value"] = group_string;
+                                        row["columns"][0]["color"] = gColors.getColor("ScrollUnselectedColor").getValue();
+                                }
+                                else
+                                {
+                                        row["columns"][0]["value"] = group_string + " " + getString("HiddenLabel");
+                                        row["columns"][0]["color"] = gColors.getColor("ScriptBgReadOnlyColor").getValue();
+                                }
                                 group_list->addElement(row);
                         }
                         group_list->sortByColumnIndex(0, TRUE);
@@ -1563,6 +1587,22 @@ void LLPanelAvatar::onClickIM(void* userdata)
         gIMMgr->addSession(name, IM_NOTHING_SPECIAL, self->mAvatarID);
 }
 
+void LLPanelAvatar::onClickGroupInvite(void* userdata)
+{
+        LLPanelAvatar* self = (LLPanelAvatar*) userdata;
+        if (self->getAvatarID().notNull())
+        {
+                LLFloaterGroupPicker* widget;
+                widget = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));
+                if (widget)
+                {
+                        widget->center();
+                        widget->setPowersMask(GP_MEMBER_INVITE);
+                        widget->setSelectCallback(callback_invite_to_group, (void *)&(self->getAvatarID()));
+                }
+        }
+}
+
 
 // static
 //-----------------------------------------------------------------------------
@@ -1780,6 +1820,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
                         continue;
                 }
                 self->childSetEnabled("Instant Message...",TRUE);
+                self->childSetEnabled("Invite to Group...",TRUE);
                 self->childSetEnabled("Pay...",TRUE);
                 self->childSetEnabled("Mute",TRUE);
 
@@ -2000,8 +2041,34 @@ void LLPanelAvatar::processAvatarGroupsReply(LLMessageSystem *msg, void**)
 
                                 LLSD row;
                                 row["id"] = group_id;
-                                row["columns"][0]["value"] = group_string;
                                 row["columns"][0]["font"] = "SANSSERIF_SMALL";
+
+                                LLGroupData *group_data = NULL;
+
+                                if (avatar_id == agent_id) // own avatar
+                                {
+                                        // Search for this group in the agent's groups list
+                                        LLDynamicArray<LLGroupData>::iterator i;
+                                        for (i = gAgent.mGroups.begin(); i != gAgent.mGroups.end(); i++)
+                                        {
+                                                if (i->mID == group_id)
+                                                {
+                                                        group_data = &*i;
+                                                        break;
+                                                }
+                                        }
+                                }
+                                // Set normal color if not found or if group is visible in profile
+                                if (!group_data || group_data->mListInProfile)
+                                {
+                                        row["columns"][0]["value"] = group_string;
+                                        row["columns"][0]["color"] = gColors.getColor("ScrollUnselectedColor").getValue();
+                                }
+                                else
+                                {
+                                        row["columns"][0]["value"] = group_string + " " + self->getString("HiddenLabel");
+                                        row["columns"][0]["color"] = gColors.getColor("ScriptBgReadOnlyColor").getValue();
+                                }
                                 if (group_list)
                                 {
                                         group_list->addElement(row);
diff --git a/linden/indra/newview/llpanelavatar.h b/linden/indra/newview/llpanelavatar.h
index 4570145..b1bb317 100644
--- a/linden/indra/newview/llpanelavatar.h
+++ b/linden/indra/newview/llpanelavatar.h
@@ -311,6 +311,7 @@ public:
 
         static void onClickTrack(       void *userdata);
         static void onClickIM(          void *userdata);
+        static void onClickGroupInvite( void *userdata);
         static void onClickOfferTeleport(       void *userdata);
         static void onClickPay( void *userdata);
         static void onClickAddFriend(void* userdata);
diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index 14e295c..e3da12a 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -318,6 +318,9 @@ BOOL LLPanelDisplay::postBuild()
         mLightingText = getChild<LLTextBox>("LightingDetailText");
         mMeshDetailText = getChild<LLTextBox>("MeshDetailText");
 
+        childSetValue("toggle_windlight_control", gSavedSettings.getBOOL("EnableWindlightRemote"));
+        mWLControl = gSavedSettings.getBOOL("EnableWindlightRemote");
+
         refresh();
 
         return TRUE;
@@ -700,6 +703,8 @@ void LLPanelDisplay::cancel()
         gSavedSettings.setU32("WLSkyDetail", mSkyLOD);
         gSavedSettings.setS32("RenderMaxPartCount", mParticleCount);
         gSavedSettings.setS32("RenderGlowResolutionPow", mPostProcess);
+
+        gSavedSettings.setBOOL("EnableWindlightRemote", mWLControl);
 }
 
 void LLPanelDisplay::apply()
@@ -711,6 +716,8 @@ void LLPanelDisplay::apply()
         {
                 applyWindowSize();
         }
+
+        gSavedSettings.setBOOL("EnableWindlightRemote", childGetValue("toggle_windlight_control").asBoolean());
 }
 
 void LLPanelDisplay::onChangeQuality(LLUICtrl *ctrl, void *data)
diff --git a/linden/indra/newview/llpaneldisplay.h b/linden/indra/newview/llpaneldisplay.h
index f98e94e..80ef5cb 100644
--- a/linden/indra/newview/llpaneldisplay.h
+++ b/linden/indra/newview/llpaneldisplay.h
@@ -170,6 +170,8 @@ protected:
         S32 mParticleCount;
         S32 mPostProcess;
 
+        BOOL mWLControl;
+
         static void setGraphicsSettings(LLControlGroup& group);
         static void createGroup();
 
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index f370116..490e40d 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -60,7 +60,6 @@ BOOL LLPanelGeneral::postBuild()
         childSetValue("small_avatar_names_checkbox", gSavedSettings.getBOOL("SmallAvatarNames"));
         childSetValue("show_my_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitle"));
         childSetValue("afk_timeout_spinner", gSavedSettings.getF32("AFKTimeout"));
-        childSetValue("rotate_mini_map_checkbox", gSavedSettings.getBOOL("MiniMapRotate"));
         childSetValue("notify_money_change_checkbox", gSavedSettings.getBOOL("NotifyMoneyChange"));
         childSetValue("use_system_color_picker_checkbox", gSavedSettings.getBOOL("UseDefaultColorPicker"));
         childSetValue("show_search_panel", gSavedSettings.getBOOL("ShowSearchBar"));
@@ -96,7 +95,6 @@ void LLPanelGeneral::apply()
         gSavedSettings.setBOOL("SmallAvatarNames", childGetValue("small_avatar_names_checkbox"));
         gSavedSettings.setBOOL("RenderHideGroupTitle", childGetValue("show_my_title_checkbox"));
         gSavedSettings.setF32("AFKTimeout", childGetValue("afk_timeout_spinner").asReal());
-        gSavedSettings.setBOOL("MiniMapRotate", childGetValue("rotate_mini_map_checkbox"));
         gSavedSettings.setBOOL("NotifyMoneyChange", childGetValue("notify_money_change_checkbox"));
         gSavedSettings.setBOOL("UseDefaultColorPicker", childGetValue("use_system_color_picker_checkbox"));
         gSavedSettings.setBOOL("ShowSearchBar", childGetValue("show_search_panel"));
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index dd71a0e..9dcf410 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -631,6 +631,10 @@ void LLPanelObject::getState( )
         }
         else
         {
+                mCtrlScaleX->setMaxValue(LLManipScale::getMaxPrimSize());
+                mCtrlScaleY->setMaxValue(LLManipScale::getMaxPrimSize());
+                mCtrlScaleZ->setMaxValue(LLManipScale::getMaxPrimSize());
+
                 // Only allowed to change these parameters for objects
                 // that you have permissions on AND are not attachments.
                 enabled = root_objectp->permModify();
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 82aeee6..af97e2e 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -4560,6 +4560,11 @@ extern LLGLdouble	gGLModelView[16];
 
 void LLSelectMgr::updateSilhouettes()
 {
+        if (!mRenderSilhouettes || !LLSelectMgr::sRenderSelectionHighlights)
+        {
+                return;
+        }
+
         S32 num_sils_genned = 0;
 
         LLVector3d      cameraPos = gAgent.getCameraPositionGlobal();
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index 127fca2..cdca5d5 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -563,7 +563,7 @@ void LLSpatialGroup::rebuildGeom()
 
 void LLSpatialPartition::rebuildGeom(LLSpatialGroup* group)
 {
-        if (group->changeLOD())
+        if (!LLPipeline::sSkipUpdate && group->changeLOD())
         {
                 group->mLastUpdateDistance = group->mDistance;
                 group->mLastUpdateViewAngle = group->mViewAngle;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 8d5aa9e..ea08298 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1025,6 +1025,7 @@ bool idle_startup()
                 requested_options.push_back("event_categories");
                 requested_options.push_back("event_notifications");
                 requested_options.push_back("classified_categories");
+                requested_options.push_back("adult_compliant");
                 //requested_options.push_back("inventory-targets");
                 requested_options.push_back("buddy-list");
                 requested_options.push_back("ui-config");
diff --git a/linden/indra/newview/llstylemap.cpp b/linden/indra/newview/llstylemap.cpp
index 6a3415f..e3bd3cd 100644
--- a/linden/indra/newview/llstylemap.cpp
+++ b/linden/indra/newview/llstylemap.cpp
@@ -47,13 +47,13 @@ LLStyleMap::~LLStyleMap()
 
 LLStyleMap &LLStyleMap::instance()
 {
-        static LLStyleMap mStyleMap;
-        return mStyleMap;
+        static LLStyleMap style_map;
+        return style_map;
 }
 
 // This is similar to the [] accessor except that if the entry doesn't already exist,
 // then this will create the entry.
-const LLStyleSP &LLStyleMap::lookup(const LLUUID &source)
+const LLStyleSP &LLStyleMap::lookupAgent(const LLUUID &source)
 {
         // Find this style in the map or add it if not.  This map holds links to residents' profiles.
         if (find(source) == end())
@@ -77,6 +77,37 @@ const LLStyleSP &LLStyleMap::lookup(const LLUUID &source)
         return (*this)[source];
 }
 
+// This is similar to lookupAgent for any generic URL encoded style.
+const LLStyleSP &LLStyleMap::lookup(const LLUUID& id, const std::string& link)
+{
+        // Find this style in the map or add it if not.
+        iterator iter = find(id);
+        if (iter == end())
+        {
+                LLStyleSP style(new LLStyle);
+                style->setVisible(true);
+                style->setFontName(LLStringUtil::null);
+                if (id != LLUUID::null && !link.empty())
+                {
+                        style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
+                        style->setLinkHREF(link);
+                }
+                else
+                        style->setColor(LLColor4::white);
+                (*this)[id] = style;
+        }
+        else
+        {
+                LLStyleSP style = (*iter).second;
+                if ( style->getLinkHREF() != link )
+                {
+                        style->setLinkHREF(link);
+                }
+        }
+
+        return (*this)[id];
+}
+
 void LLStyleMap::update()
 {
         for (style_map_t::iterator iter = begin(); iter != end(); ++iter)
diff --git a/linden/indra/newview/llstylemap.h b/linden/indra/newview/llstylemap.h
index a38d253..f1eada9 100644
--- a/linden/indra/newview/llstylemap.h
+++ b/linden/indra/newview/llstylemap.h
@@ -47,7 +47,8 @@ public:
         LLStyleMap();
         ~LLStyleMap();
         // Just like the [] accessor but it will add the entry in if it doesn't exist.
-        const LLStyleSP &lookup(const LLUUID &source); 
+        const LLStyleSP &lookupAgent(const LLUUID &source);
+        const LLStyleSP &lookup(const LLUUID &source, const std::string& link);
         static LLStyleMap &instance();
 
         // Forces refresh of the entries, call when something changes (e.g. link color).
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index be0b8eb..71135d7 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -349,6 +349,13 @@ void LLFloaterTexturePicker::updateImageStats()
                 {
                         mResolutionLabel->setTextArg("[DIMENSIONS]", std::string("[? x ?]"));
                 }
+                if (gAgent.isGodlike())
+                {
+                        std::string tstring = "Pick: ";
+                        std::string image_id_string = mTexturep->getID().asString();
+                        tstring = tstring + image_id_string.replace(24, 35, 12, '*'); // hide last segment to discourage theft
+                        setTitle(tstring);
+                }
         }
 }
 
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 5a21992..b32169d 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -191,7 +191,7 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
                         // nothing
                         break;
                 case CLICK_ACTION_SIT:
-                        if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting)) // agent not already sitting
+                        if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting) && !gSavedSettings.getBOOL("BlockClickSit")) // agent not already sitting
                         {
                                 handle_sit_or_stand();
                                 return TRUE;
@@ -687,9 +687,10 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
                 else if (mPick.mObjectID.notNull()
                                  && !mPick.mPosGlobal.isExactlyZero())
                 {
-                        // Hit an object
-                        // HACK: Call the last hit position the point we hit on the object
-                        //gLastHitPosGlobal += gLastHitObjectOffset;
+                        //Zwagoth: No more teleport to HUD attachments. >:o
+                        if(mPick.getObject().notNull() && mPick.getObject()->isHUDAttachment())
+                                return FALSE;
+
                         handle_go_to();
                         return TRUE;
                 }
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index e83bc2d..8a92963 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -4618,7 +4618,8 @@ class LLToolsEnableUnlink : public view_listener_t
                         LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() &&
                         !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment())
                 {
-                        if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 
+                        if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() > 0 &&
+                                LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 
                                 LLSelectMgr::getInstance()->getSelection()->getObjectCount())
                         {
                                 new_value = true;
@@ -6720,7 +6721,10 @@ void handle_selected_texture_info(void*)
                         S32 height = img->getHeight();
                         S32 width = img->getWidth();
                         S32 components = img->getComponents();
-                        msg = llformat("%dx%d %s on face ",
+                        std::string image_id_string = image_id.asString();
+                        image_id_string = image_id_string.replace(24, 35, 12, '*') + " "; // hide last segment to discourage theft
+                        msg = llformat("%s%dx%d %s on face ",
+                                                                image_id_string.c_str(),
                                                                 width,
                                                                 height,
                                                                 (components == 4 ? "alpha" : "opaque"));
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 1b2ba22..d5d9324 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -1266,7 +1266,7 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
                 if (gCacheName->getName(info->mFromID, first_name, last_name))
                 {
 // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e)
-                        if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) )
+                        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) )
                         {
                                 first_name = gRlvHandler.getAnonym(first_name.append(" ").append(last_name));
                                 last_name.clear();
@@ -1287,12 +1287,15 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
         {
                 // *TODO:translate -> [FIRST] [LAST]
 // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e)
-                if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) )
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) )
                 {
                         args["[NAME]"] = gRlvHandler.getAnonym(info->mFromName);
                 }
 // [/RLVa:KB]
-                //args["[NAME]"] = info->mFromName;
+                else
+                {
+                        args["[NAME]"] = info->mFromName;
+                }
                 LLNotifyBox::showXml("UserGiveItem", args,
                                                         &inventory_offer_callback, (void*)info);
         }
@@ -1921,15 +1924,51 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
         break;
 
         case IM_FROM_TASK:
-                if (is_busy && !is_owned_by_me)
                 {
-                        return;
+                        if (is_busy && !is_owned_by_me)
+                        {
+                                return;
+                        }
+                        chat.mText = name + separator_string + message.substr(message_offset);
+                        chat.mFromName = name;
+
+                        // Build a link to open the object IM info window.
+                        std::string location = ll_safe_string((char*)binary_bucket,binary_bucket_size);
+
+                        LLSD query_string;
+                        query_string["owner"] = from_id;
+                        query_string["slurl"] = location.c_str();
+                        query_string["name"] = name;
+                        if (from_group)
+                        {
+                                query_string["groupowned"] = "true";
+                        }
+
+                        if (session_id.notNull())
+                        {
+                                chat.mFromID = session_id;
+                        }
+                        else
+                        {
+                                // This message originated on a region without the updated code for task id and slurl information.
+                                // We just need a unique ID for this object that isn't the owner ID.
+                                // If it is the owner ID it will overwrite the style that contains the link to that owner's profile.
+                                // This isn't ideal - it will make 1 style for all objects owned by the the same person/group.
+                                // This works because the only thing we can really do in this case is show the owner name and link to their profile.
+                                chat.mFromID = from_id ^ gAgent.getSessionID();
+                        }
+
+                        std::ostringstream link;
+                        link << "secondlife:///app/objectim/" << session_id
+                                        << LLURI::mapToQueryString(query_string);
+
+                        chat.mURL = link.str();
+
+                        // Note: lie to LLFloaterChat::addChat(), pretending that this is NOT an IM, because
+                        // IMs from objcts don't open IM sessions.
+                        chat.mSourceType = CHAT_SOURCE_OBJECT;
+                        LLFloaterChat::addChat(chat, FALSE, FALSE);
                 }
-                chat.mText = name + separator_string + message.substr(message_offset);
-                // Note: lie to LLFloaterChat::addChat(), pretending that this is NOT an IM, because
-                // IMs from objcts don't open IM sessions.
-                chat.mSourceType = CHAT_SOURCE_OBJECT;
-                LLFloaterChat::addChat(chat, FALSE, FALSE);
                 break;
         case IM_FROM_TASK_AS_ALERT:
                 if (is_busy && !is_owned_by_me)
@@ -3007,6 +3046,10 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
         // appropriate.
         LLVector3 shift_vector = regionp->getPosRegionFromGlobal(
                 gAgent.getRegion()->getOriginGlobal());
+        // don't shift objects, if teleporting more than about 1000 sims, as
+        // for long teleports shifting objects garbles the view at the target region
+        if (shift_vector.lengthSquared() > 6.5e10f)
+                shift_vector = LLVector3::zero;
         gAgent.setRegion(regionp);
         gObjectList.shiftObjects(shift_vector);
         gAssetStorage->setUpstream(msg->getSender());
@@ -3112,6 +3155,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 
         // If the server version has changed, display an info box and offer
         // to display the release notes, unless this is the initial log in.
+        // Also verify we're on an OpenSimulator here.
         if (gLastVersionChannel == version_channel)
         {
                 return;
@@ -3123,6 +3167,15 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
                         "ServerVersionChanged", display_release_notes, NULL);
         }
 
+        if (version_channel.find("OpenSim") != std::string::npos)
+        {
+                gSavedSettings.setBOOL("LoggedIntoOpenSim", TRUE);
+        }
+        else
+        {
+                gSavedSettings.setBOOL("LoggedIntoOpenSim", FALSE);
+        }
+
         gLastVersionChannel = version_channel;
 }
 
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index 78c1730..cf37058 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -165,6 +165,8 @@ U64 LLViewerObjectList::getIndex(const U32 local_id,
 
 BOOL LLViewerObjectList::removeFromLocalIDTable(const LLViewerObject &object)
 {
+        if (object.mRegionp)
+        {
                 U32 local_id = object.mLocalID;
                 LLHost region_host = object.getRegion()->getHost();
                 U32 ip = region_host.getAddress();
@@ -175,6 +177,8 @@ BOOL LLViewerObjectList::removeFromLocalIDTable(const LLViewerObject &object)
                 U64     indexid = (((U64)index) << 32) | (U64)local_id;
                 return sIndexAndLocalIDToUUID.erase(indexid) > 0 ? TRUE : FALSE;
         }
+        return FALSE;
+}
 
 void LLViewerObjectList::setUUIDAndLocal(const LLUUID &id,
                                                                                   const U32 local_id,
diff --git a/linden/indra/newview/llviewerthrottle.cpp b/linden/indra/newview/llviewerthrottle.cpp
index 72a8a80..95c6ae2 100644
--- a/linden/indra/newview/llviewerthrottle.cpp
+++ b/linden/indra/newview/llviewerthrottle.cpp
@@ -49,7 +49,7 @@ const F32 MAX_FRACTIONAL = 1.5f;
 const F32 MIN_FRACTIONAL = 0.2f;
 
 const F32 MIN_BANDWIDTH = 50.f;
-const F32 MAX_BANDWIDTH = 1500.f;
+const F32 MAX_BANDWIDTH = 5000.f;
 const F32 STEP_FRACTIONAL = 0.1f;
 const F32 TIGHTEN_THROTTLE_THRESHOLD = 3.0f; // packet loss % per s
 const F32 EASE_THROTTLE_THRESHOLD = 0.5f; // packet loss % per s
diff --git a/linden/indra/newview/llvlcomposition.cpp b/linden/indra/newview/llvlcomposition.cpp
index bc7a2f4..cd8d1c0 100644
--- a/linden/indra/newview/llvlcomposition.cpp
+++ b/linden/indra/newview/llvlcomposition.cpp
@@ -79,8 +79,13 @@ LLVLComposition::LLVLComposition(LLSurface *surfacep, const U32 width, const F32
         // Initialize the texture matrix to defaults.
         for (S32 i = 0; i < CORNER_COUNT; ++i)
         {
-                mStartHeight[i] = gSavedSettings.getF32("TerrainColorStartHeight");
-                mHeightRange[i] = gSavedSettings.getF32("TerrainColorHeightRange");
+                //Zwag: I'm making these static values because they are a LARGE performance problem
+                // right now, and I've never heard of anyone changing them, they are not referenced
+                // elsewhere, and have not changed in defaults since the original source code release.
+                // We can move these back to signal connected statics if they really become important
+                // variables in the future.
+                mStartHeight[i] = 20.f;//gSavedSettings.getF32("TerrainColorStartHeight");
+                mHeightRange[i] = 60.f;//gSavedSettings.getF32("TerrainColorHeightRange");
         }
         mTexScaleX = 16.f;
         mTexScaleY = 16.f;
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 158977e..24272d8 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3261,7 +3261,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 if (title && title->getString() && title->getString()[0] != '\0')
                                 {
                                         line += title->getString();
-                                        LLStringFn::replace_nonprintable(line,LL_UNKNOWN_CHAR);
+                                        //LLStringFn::replace_nonprintable(line,LL_UNKNOWN_CHAR); IMP-136 -- MC
                                         line += "\n";
                                         line += firstname->getString();
                                 }
@@ -3321,7 +3321,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 mNameMute = is_muted;
                                 mNameAppearance = is_appearance;
                                 mTitle = title ? title->getString() : "";
-                                LLStringFn::replace_nonprintable(mTitle,LL_UNKNOWN_CHAR);
+                                //LLStringFn::replace_nonprintable(mTitle,LL_UNKNOWN_CHAR); IMP-136 -- MC
                                 mNameString = utf8str_to_wstring(line);
                                 new_name = TRUE;
                         }
diff --git a/linden/indra/newview/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp
new file mode 100644
index 0000000..591b413
--- /dev/null
+++ b/linden/indra/newview/llwindlightremotectrl.cpp
@@ -0,0 +1,267 @@
+/**
+* @file llwindlightremotectrl.cpp
+* @brief toolbar remote for windlight options and presets
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* Copyright (c) 2009, McCabe Maxsted
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided 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.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llwindlightremotectrl.h"
+
+#include "llbutton.h"
+#include "llcombobox.h"
+#include "llfloaterenvsettings.h"
+#include "llfloaterwindlight.h"
+#include "lloverlaybar.h"
+#include "lluictrlfactory.h"
+#include "llwlparammanager.h"
+#include "llviewercontrol.h"
+
+
+class LLWindlightRemoteObserver : public LLWLPresetsObserver
+{
+public:
+        LLWindlightRemoteObserver(LLWindlightRemoteCtrl* wind_rem) : mWindlightRemote(wind_rem){}
+        virtual ~LLWindlightRemoteObserver() {}
+        virtual void changed() { mWindlightRemote->refreshPresets(); }
+private:
+        LLWindlightRemoteCtrl* mWindlightRemote;
+};
+
+
+LLWindlightRemoteCtrl::LLWindlightRemoteCtrl()  
+{
+        mPresetsCombo = NULL;
+        mObserver = NULL;
+        setIsChrome(TRUE);
+
+        build();
+
+        setFocusRoot(TRUE);
+}
+
+LLWindlightRemoteCtrl::~LLWindlightRemoteCtrl()
+{
+        delete mObserver;
+        mObserver = NULL;
+}
+
+void LLWindlightRemoteCtrl::draw()
+{
+        LLButton* expand_button = getChild<LLButton>("Popup");
+        if (expand_button)
+        {
+                if (expand_button->getToggleState())
+                {
+                        expand_button->setImageOverlay("arrow_down.tga");
+                }
+                else
+                {
+                        expand_button->setImageOverlay("arrow_up.tga");
+                }
+        }
+
+        LLPanel::draw();
+}
+
+void LLWindlightRemoteCtrl::build()
+{
+        if (gSavedSettings.getBOOL("ShowWindlightSettingsPopup"))
+        {
+                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_windlight_remote_expanded.xml");
+        }
+        else
+        {
+                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_windlight_remote.xml");
+        }
+}
+
+BOOL LLWindlightRemoteCtrl::postBuild()
+{
+        
+        childSetAction("Environment", onClickToggleEnvironment, this);
+        childSetAction("Popup", onClickPopupBtn, this);
+
+        mPresetsCombo = getChild<LLComboBox>("Presets");
+        if (mPresetsCombo)
+        {
+                mPresetsCombo->setCommitCallback(onCommitPreset);
+                mPresetsCombo->setCallbackUserData(this);
+
+                // set up observer to follow changes
+                mObserver = new LLWindlightRemoteObserver(this);
+                LLWLParamManager::addObserver(mObserver);
+
+                // refresh list from current presets
+                refreshPresets();
+        }
+
+        return TRUE;
+}
+
+void LLWindlightRemoteCtrl::refreshPresets()
+{
+        if (mPresetsCombo)
+        {
+                // snag current preset
+                LLWLParamManager * param_mgr = LLWLParamManager::instance();
+                LLWLParamSet& currentParams = param_mgr->mCurParams;
+                
+                // clear in case presets names have changed
+                mPresetsCombo->clearRows();
+
+                std::map<std::string, LLWLParamSet>::iterator mIt = 
+                        param_mgr->mParamList.begin();
+                for(; mIt != param_mgr->mParamList.end(); mIt++) 
+                {
+                        mPresetsCombo->add(mIt->first);
+                }
+                
+                // insert separator and add World menu options
+                mPresetsCombo->addSeparator(ADD_BOTTOM);
+                mPresetsCombo->addSimpleElement(getString("sunrise"), ADD_BOTTOM);
+                mPresetsCombo->addSimpleElement(getString("noon"), ADD_BOTTOM);
+                mPresetsCombo->addSimpleElement(getString("sunset"), ADD_BOTTOM);
+                mPresetsCombo->addSimpleElement(getString("midnight"), ADD_BOTTOM);
+                mPresetsCombo->addSimpleElement(getString("revert_region"), ADD_BOTTOM);
+
+                if (mPresetsCombo->getSelectedItemLabel() != currentParams.mName &&
+                        !currentParams.mName.empty())
+                {
+                        mPresetsCombo->selectByValue(LLSD(currentParams.mName));
+                }
+                else
+                {
+                        mPresetsCombo->selectByValue(LLSD("Default"));
+                }
+        }
+}
+
+// static
+void LLWindlightRemoteCtrl::onCommitPreset(LLUICtrl* ctrl, void* data)
+{
+        LLWindlightRemoteCtrl* self = (LLWindlightRemoteCtrl*)data;
+
+        LLCtrlListInterface* presets = self->mPresetsCombo ? self->mPresetsCombo->getListInterface() : NULL;
+        if (presets)
+        {
+                S32 index = presets->getFirstSelectedIndex();
+                if (index <= 0)
+                {
+                        // Open Advanced Sky
+                        LLFloaterWindLight::show();
+                        return;
+                }
+
+                // check for World menu options; if none, apply preset
+                std::string selected = self->mPresetsCombo->getSelectedValue().asString();
+
+                if (selected == self->getString("sunrise"))
+                {
+                        // set the value, turn off animation
+                        LLWLParamManager::instance()->mAnimator.setDayTime(0.25);
+                        LLWLParamManager::instance()->mAnimator.mIsRunning = false;
+                        LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
+
+                        // then call update once
+                        LLWLParamManager::instance()->mAnimator.update(
+                                LLWLParamManager::instance()->mCurParams);
+                }
+                else if (selected == self->getString("noon"))
+                {
+                        // set the value, turn off animation
+                        LLWLParamManager::instance()->mAnimator.setDayTime(0.567);
+                        LLWLParamManager::instance()->mAnimator.mIsRunning = false;
+                        LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
+
+                        // then call update once
+                        LLWLParamManager::instance()->mAnimator.update(
+                                LLWLParamManager::instance()->mCurParams);
+                }
+                else if (selected == self->getString("sunset"))
+                {
+                        // set the value, turn off animation
+                        LLWLParamManager::instance()->mAnimator.setDayTime(0.75);
+                        LLWLParamManager::instance()->mAnimator.mIsRunning = false;
+                        LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
+
+                        // then call update once
+                        LLWLParamManager::instance()->mAnimator.update(
+                                LLWLParamManager::instance()->mCurParams);
+                }
+                else if (selected == self->getString("midnight"))
+                {
+                        // set the value, turn off animation
+                        LLWLParamManager::instance()->mAnimator.setDayTime(0.0);
+                        LLWLParamManager::instance()->mAnimator.mIsRunning = false;
+                        LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
+
+                        // then call update once
+                        LLWLParamManager::instance()->mAnimator.update(
+                                LLWLParamManager::instance()->mCurParams);
+                }
+                else if (selected == self->getString("revert_region"))
+                {
+                        LLWLParamManager::instance()->mAnimator.mIsRunning = true;
+                        LLWLParamManager::instance()->mAnimator.mUseLindenTime = true;  
+                }
+                else
+                {
+                        // Apply preset
+                        LLWLParamManager::instance()->mAnimator.mIsRunning = false;
+                        LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
+                        LLWLParamManager::instance()->loadPreset(selected, true);
+                }
+        }
+}
+
+// static
+void LLWindlightRemoteCtrl::onClickToggleEnvironment(void* data)
+{
+        // if evn settings not there or is hidden, show it
+        if(     !LLFloaterEnvSettings::isOpen() || 
+                !LLFloaterEnvSettings::instance()->getVisible()) 
+        {
+                LLFloaterEnvSettings::show();
+        
+        // otherwise, close it button acts like a toggle
+        } 
+        else 
+        {
+                LLFloaterEnvSettings::instance()->close();
+        }
+}
+
+//static
+void LLWindlightRemoteCtrl::onClickPopupBtn(void* data)
+{
+        LLWindlightRemoteCtrl* remotep = (LLWindlightRemoteCtrl*)data;
+
+        remotep->deleteAllChildren();
+        remotep->build();
+        gOverlayBar->layoutButtons();
+}
diff --git a/linden/indra/newview/llwindlightremotectrl.h b/linden/indra/newview/llwindlightremotectrl.h
new file mode 100644
index 0000000..e4ad2d5
--- /dev/null
+++ b/linden/indra/newview/llwindlightremotectrl.h
@@ -0,0 +1,60 @@
+/**
+* @file llwindlightremotectrl.h
+* @brief toolbar remote for windlight options and presets
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* Copyright (c) 2009, McCabe Maxsted
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided 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.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#ifndef LL_LLWINDLIGHTREMOTECTRL_H
+#define LL_LLWINDLIGHTREMOTECTRL_H
+
+#include "llpanel.h"
+
+class LLComboBox;
+class LLWLPresetsObserver;
+
+class LLWindlightRemoteCtrl : public LLPanel
+{
+public:
+        LLWindlightRemoteCtrl();
+        virtual ~LLWindlightRemoteCtrl();
+        /*virtual*/ BOOL postBuild();
+        /*virtual*/ void draw();
+
+        void refreshPresets();
+
+private:
+        LLComboBox*                                             mPresetsCombo;
+        LLWLPresetsObserver*            mObserver;
+
+        void build();
+
+        static void onCommitPreset(LLUICtrl* ctrl, void* data);
+        static void onClickToggleEnvironment(void* data);
+        static void onClickPopupBtn(void* data);
+};
+
+#endif
diff --git a/linden/indra/newview/llwlparammanager.cpp b/linden/indra/newview/llwlparammanager.cpp
index c1723f7..ba3d070 100644
--- a/linden/indra/newview/llwlparammanager.cpp
+++ b/linden/indra/newview/llwlparammanager.cpp
@@ -62,6 +62,7 @@
 #include "curl/curl.h"
 
 LLWLParamManager * LLWLParamManager::sInstance = NULL;
+std::vector<LLWLPresetsObserver*> LLWLParamManager::sObservers;
 
 LLWLParamManager::LLWLParamManager() :
 
@@ -238,6 +239,8 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
                 getParamSet(name, mCurParams);
                 propagateParameters();
         }
+
+        notifyObservers();
 }       
 
 void LLWLParamManager::savePreset(const std::string & name)
@@ -264,6 +267,7 @@ void LLWLParamManager::savePreset(const std::string & name)
         presetsXML.close();
 
         propagateParameters();
+        notifyObservers();
 }
 
 void LLWLParamManager::updateShaderUniforms(LLGLSLShader * shader)
@@ -538,6 +542,8 @@ bool LLWLParamManager::removeParamSet(const std::string& name, bool delete_from_
                 gDirUtilp->deleteFilesInDir(path_name, escaped_name + ".xml");
         }
 
+        notifyObservers();
+
         return true;
 }
 
@@ -566,3 +572,37 @@ LLWLParamManager * LLWLParamManager::instance()
 
         return sInstance;
 }
+
+// static
+void LLWLParamManager::addObserver(LLWLPresetsObserver* observer)
+{
+        sObservers.push_back(observer);
+}
+
+// static
+void LLWLParamManager::removeObserver(LLWLPresetsObserver* observer)
+{
+        std::vector<LLWLPresetsObserver*>::iterator it;
+        it = std::find(sObservers.begin(), sObservers.end(), observer);
+        if (it != sObservers.end())
+        {
+                sObservers.erase(it);
+        }
+}
+
+// Call this method when it's time to update everyone on a new state.
+// Copy the list because an observer could respond by removing itself
+// from the list. Static
+void LLWLParamManager::notifyObservers()
+{
+        lldebugs << "LLWLPresetsObserver::notifyObservers" << llendl;
+
+        std::vector<LLWLPresetsObserver*> observers = sObservers;
+
+        std::vector<LLWLPresetsObserver*>::iterator it;
+        for (it = observers.begin(); it != observers.end(); ++it)
+        {
+                LLWLPresetsObserver* observer = *it;
+                observer->changed();
+        }
+}
diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h
index 1d9291c..355d3e3 100644
--- a/linden/indra/newview/llwlparammanager.h
+++ b/linden/indra/newview/llwlparammanager.h
@@ -40,6 +40,13 @@
 #include "llviewercamera.h"
 
 class LLGLSLShader;
+
+class LLWLPresetsObserver
+{
+public:
+        virtual ~LLWLPresetsObserver() { };
+        virtual void changed() = 0;
+};
  
 // color control
 struct WLColorControl {
@@ -195,6 +202,11 @@ public:
         // singleton pattern implementation
         static LLWLParamManager * instance();
 
+        // manage observers
+        static void addObserver(LLWLPresetsObserver* observer);
+        static void removeObserver(LLWLPresetsObserver* observer);
+        static void notifyObservers();
+
 public:
 
         // helper variables
@@ -249,12 +261,13 @@ public:
         F32 mDomeRadius;
         
         // list of all the parameters, listed by name
-        std::map<std::string, LLWLParamSet> mParamList;
-        
+        std::map<std::string, LLWLParamSet> mParamList; 
         
 private:
         // our parameter manager singleton instance
         static LLWLParamManager * sInstance;
+        
+        static std::vector<LLWLPresetsObserver*> sObservers;
 
 };
 
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 5e51e6f..947bdfd 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -71,9 +71,10 @@ const S32 SCROLL_HINT_WIDTH = 65;
 const F32 BIG_DOT_RADIUS = 5.f;
 BOOL LLWorldMapView::sHandledLastClick = FALSE;
 
-LLUIImagePtr LLWorldMapView::sAvatarYouSmallImage = NULL;
 LLUIImagePtr LLWorldMapView::sAvatarSmallImage = NULL;
-LLUIImagePtr LLWorldMapView::sAvatarLargeImage = NULL;
+LLUIImagePtr LLWorldMapView::sAvatarYouImage = NULL;
+LLUIImagePtr LLWorldMapView::sAvatarYouLargeImage = NULL;
+LLUIImagePtr LLWorldMapView::sAvatarLevelImage = NULL;
 LLUIImagePtr LLWorldMapView::sAvatarAboveImage = NULL;
 LLUIImagePtr LLWorldMapView::sAvatarBelowImage = NULL;
 
@@ -113,11 +114,12 @@ std::map<std::string,std::string> LLWorldMapView::sStringsMap;
 
 void LLWorldMapView::initClass()
 {
-        sAvatarYouSmallImage =  LLUI::getUIImage("map_avatar_you_8.tga");
         sAvatarSmallImage =     LLUI::getUIImage("map_avatar_8.tga");
-        sAvatarLargeImage =     LLUI::getUIImage("map_avatar_16.tga");
-        sAvatarAboveImage =     LLUI::getUIImage("map_avatar_above_8.tga");
-        sAvatarBelowImage =     LLUI::getUIImage("map_avatar_below_8.tga");
+        sAvatarYouImage =               LLUI::getUIImage("map_avatar_16.tga");
+        sAvatarYouLargeImage =  LLUI::getUIImage("map_avatar_you_32.tga");
+        sAvatarLevelImage =     LLUI::getUIImage("map_avatar_32.tga");
+        sAvatarAboveImage =     LLUI::getUIImage("map_avatar_above_32.tga");
+        sAvatarBelowImage =     LLUI::getUIImage("map_avatar_below_32.tga");
 
         sHomeImage =                    LLUI::getUIImage("map_home.tga");
         sTelehubImage =                 LLUI::getUIImage("map_telehub.tga");
@@ -137,9 +139,10 @@ void LLWorldMapView::initClass()
 // static
 void LLWorldMapView::cleanupClass()
 {
-        sAvatarYouSmallImage = NULL;
         sAvatarSmallImage = NULL;
-        sAvatarLargeImage = NULL;
+        sAvatarYouImage = NULL;
+        sAvatarYouLargeImage = NULL;
+        sAvatarLevelImage = NULL;
         sAvatarAboveImage = NULL;
         sAvatarBelowImage = NULL;
 
@@ -606,7 +609,11 @@ void LLWorldMapView::draw()
                         gGL.end();
                 }
 
-                // If this is mature, and you are not, draw a line across it
+                // As part of the AO project, we no longer want to draw access indicators;
+                // it's too complicated to get all the rules straight and will only 
+                // cause confusion.
+                /**********************
+                 // If this is mature, and you are not, draw a line across it
                 if (info->mAccess != SIM_ACCESS_DOWN
                         && info->mAccess > SIM_ACCESS_PG
                         && gAgent.isTeen())
@@ -622,6 +629,7 @@ void LLWorldMapView::draw()
                                 gGL.vertex2f(right, top);
                         gGL.end();
                 }
+                 **********************/
 
                 // Draw the region name in the lower left corner
                 LLFontGL* font = LLFontGL::sSansSerifSmall;
@@ -651,6 +659,33 @@ void LLWorldMapView::draw()
                         {
                                 mesg = llformat( "%s (%s)", info->mName.c_str(), sStringsMap["offline"].c_str());
                         }
+                        else if (gSavedSettings.getBOOL("MapShowAgentCount") && gSavedSettings.getBOOL("MapShowPeople"))
+                        {
+                                // Display the agent count after the region name
+                                S32 agent_count = LLWorldMap::getInstance()->mNumAgents[handle];
+                                LLViewerRegion *region = gAgent.getRegion();
+
+                                if (region && region->getHandle() == info->mHandle)
+                                {
+                                        ++agent_count; // Bump by 1 if we're in this region
+                                }
+
+                                if (agent_count > 0)
+                                {
+                                        //TODO: move this and the tooltip strings into XML
+                                        std::string count = llformat("%d %s", agent_count, agent_count > 1 ? "avatars" : "avatar");
+                                        font->renderUTF8(
+                                                count, 0,
+                                                llfloor(left + 3), 
+                                                llfloor(bottom + 20),
+                                                LLColor4::white,
+                                                LLFontGL::LEFT,
+                                                LLFontGL::BASELINE,
+                                                LLFontGL::DROP_SHADOW);
+
+                                        mesg = info->mName;
+                                }
+                        }
                         else
                         {
                                 mesg = info->mName;
@@ -732,7 +767,7 @@ void LLWorldMapView::draw()
 
         // Now draw your avatar after all that other stuff.
         LLVector3d pos_global = gAgent.getPositionGlobal();
-        drawImage(pos_global, sAvatarLargeImage);
+        drawImage(pos_global, sAvatarYouImage);
 
         LLVector3 pos_map = globalPosToView(pos_global);
         if (!pointInView(llround(pos_map.mV[VX]), llround(pos_map.mV[VY])))
@@ -1161,11 +1196,11 @@ BOOL LLWorldMapView::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* stic
 
                                 if (agent_count == 1)
                                 {
-                                        message += "person";
+                                        message += "avatar";
                                 }
                                 else
                                 {
-                                        message += "people";
+                                        message += "avatars";
                                 }
                         }
                 }
@@ -1241,7 +1276,7 @@ void LLWorldMapView::drawAvatar(F32 x_pixels,
                                                                 F32 dot_radius)
 {
         const F32 HEIGHT_THRESHOLD = 7.f;
-        LLUIImagePtr dot_image = sAvatarSmallImage;
+        LLUIImagePtr dot_image = sAvatarLevelImage;
         if(relative_z < -HEIGHT_THRESHOLD) 
         {
                 dot_image = sAvatarBelowImage; 
@@ -1250,9 +1285,13 @@ void LLWorldMapView::drawAvatar(F32 x_pixels,
         { 
                 dot_image = sAvatarAboveImage;
         }
+
+        S32 dot_width = llround(dot_radius * 2.f);
         dot_image->draw(
-                llround(x_pixels) - dot_image->getWidth()/2,
-                llround(y_pixels) - dot_image->getHeight()/2, 
+                llround(x_pixels - dot_radius),
+                llround(y_pixels - dot_radius),
+                dot_width,
+                dot_width,
                 color);
 }
 
diff --git a/linden/indra/newview/llworldmapview.h b/linden/indra/newview/llworldmapview.h
index b97dfb5..b6ab855 100644
--- a/linden/indra/newview/llworldmapview.h
+++ b/linden/indra/newview/llworldmapview.h
@@ -136,11 +136,13 @@ protected:
 public:
         LLColor4                mBackgroundColor;
 
-        static LLUIImagePtr     sAvatarYouSmallImage;
         static LLUIImagePtr     sAvatarSmallImage;
-        static LLUIImagePtr     sAvatarLargeImage;
+        static LLUIImagePtr     sAvatarYouImage;
+        static LLUIImagePtr     sAvatarYouLargeImage;
+        static LLUIImagePtr     sAvatarLevelImage;
         static LLUIImagePtr     sAvatarAboveImage;
         static LLUIImagePtr     sAvatarBelowImage;
+
         static LLUIImagePtr     sTelehubImage;
         static LLUIImagePtr     sInfohubImage;
         static LLUIImagePtr     sHomeImage;
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 42cb0ac..9ad1787 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -69,7 +69,9 @@
 <TextEmbeddedItemColor value="0, 0, 128, 255" />            <!-- Text of items embedded in notecards -->
 <TextDefaultColor value="0, 20, 0, 255"/>                   <!-- Non-keyword text in the script editor -->
 <ScriptBgReadOnlyColor value="100, 100, 100, 255" />        <!-- Not used -->
- 
+<TextLinkColor value="144, 165, 208, 255"/>
+<TextLinkHoverColor value="255, 255, 255, 255"/>
+  
 <!-- LISTBOXES -->
 <ScrollBgReadOnlyColor value="200, 209, 204, 255" />    <!-- Background of read only lists -->
 <ScrollBgWriteableColor value="200, 209, 204, 255" />   <!-- Background of editable lists, e.g. groups-->
@@ -160,6 +162,7 @@
 <MapAvatar value="0, 255, 0, 255" />                    <!-- Your avatar's glyph color -->
 <MapFriend value="255, 255, 0, 255" />                  <!-- Your friends' glyph color -->
 <MapMuted value="128, 128, 128, 255" />                 <!-- Muted avatars' glyph color -->
+<MapSelected value="255, 0, 0, 255" />                 <!-- Selected avatars' glyph color -->
   
   <!-- MINI-MAP -->
 <NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
diff --git a/linden/indra/newview/skins/default/textures/arrow_left.tga b/linden/indra/newview/skins/default/textures/arrow_left.tga
new file mode 100644
index 0000000..68e6280
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/arrow_left.tga
diff --git a/linden/indra/newview/skins/default/textures/arrow_right.tga b/linden/indra/newview/skins/default/textures/arrow_right.tga
new file mode 100644
index 0000000..7a5a30e
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/arrow_right.tga
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_32.tga
new file mode 100644
index 0000000..aebeab4
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/map_avatar_32.tga
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga
new file mode 100644
index 0000000..65bd056
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga
new file mode 100644
index 0000000..496c44b
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga
new file mode 100644
index 0000000..782207e
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml
index 9e1d9b5..9b0e4c7 100644
--- a/linden/indra/newview/skins/default/textures/textures.xml
+++ b/linden/indra/newview/skins/default/textures/textures.xml
@@ -150,7 +150,6 @@
   
   <texture name="map_avatar_16.tga"/>
   <texture name="map_avatar_8.tga"/>
-  <texture name="map_avatar_you_8.tga"/>
   <texture name="map_event.tga"/>
   <texture name="map_event_mature.tga"/>
   <texture name="map_home.tga"/>
@@ -365,6 +364,9 @@
   <texture name="icn_label_music.tga"/>
   <texture name="icn_label_media.tga"/>
   <texture name="arrow_down.tga"/>
+  <texture name="arrow_up.tga"/>
+  <texture name="arrow_left.tga"/>
+  <texture name="arrow_right.tga"/>
   <texture name="cloud-particle.j2c" use_mips="true"/>
   
   <texture name="skin_thumbnail_default.png" preload="true" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
index 3d1c569..f0c97f2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
@@ -205,5 +205,23 @@
                                 <on_click filter="" function="Inventory.SetSortBy" userdata="systemfolderstotop" />
                         </menu_item_check>
                 </menu>
+    <menu bottom_delta="64" drop_shadow="true" height="49"
+                     label="Search" left="0" mouse_opaque="false" name="Sort" opaque="true"
+                     tear_off="true" width="118">
+      <menu_item_check bottom_delta="-18" control_name="Inventory.SearchByName" height="18"
+                             label="By Name" left="0" mouse_opaque="true" name="By Name" width="118">
+        <on_click filter="" function="Inventory.SetSearchBy" userdata="name" />
+      </menu_item_check>
+      <menu_item_check bottom_delta="-18" control_name="Inventory.SearchByCreator" height="18"
+           label="By Creator" left="0" mouse_opaque="true" name="By Creator" width="118">
+        <on_click filter="" function="Inventory.SetSearchBy" userdata="creator" />
+      </menu_item_check>
+      <menu_item_separator bottom_delta="-8" height="8" left="0" mouse_opaque="true" name="separator"
+                             width="118" />
+      <menu_item_check bottom_delta="-18" control_name="Inventory.SearchByAll" height="18"
+           label="By All" left="0" mouse_opaque="true" name="By All" width="118">
+        <on_click filter="" function="Inventory.SetSearchBy" userdata="all" />
+      </menu_item_check>
+    </menu>
         </menu_bar>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index 318f46a..7beb7e4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
      height="440" min_height="140" min_width="467" name="floater_about"
-     rect_control="FloaterMediaRect" title="Media Browser" width="560">
+     rect_control="FloaterMediaRect" title="Web Browser" width="560">
         <layout_stack name="stack1" bottom="0" follows="left|right|top|bottom" left="10" top="-20" width="540">
                 <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="nav_controls" user_resize="false"
                      width="540">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index 9f1e164..3485812 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -1,7 +1,98 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="true"
-         can_tear_off="false" follows="top|right" height="220" min_height="64" min_width="64"
+         can_tear_off="false" follows="top|right" height="455" min_height="400" min_width="240"
          name="minimap" rect_control="FloaterMiniMapRect" width="200">
-    <panel bottom="2" follows="left|top|right|bottom" height="216" label="Mini Map"
-                 left="2" mouse_opaque="false" name="mini_mapview" width="196" />
+
+  <panel label="Mini Map" name="mini_mapview"
+         top="-2" left="2" bottom="196" right="196"
+         follows="left|top|right|bottom" mouse_opaque="false"  />
+
+  <panel name="RadarPanel" label="Radar"
+         background_visible="true" bg_alpha_color="NetMapBackgroundColor"
+         left="2" top="196" right="196" height="120"
+         follows="left|right|bottom" border="false" mouse_opaque="true">
+
+    <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom="-20" drop_shadow_visible="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+       mouse_opaque="true" name="lblAvatarCount" v_pad="0"
+       width="220">
+      0
+    </text>
+    <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        bottom="-20" drop_shadow_visible="true" follows="left|top"
+        font="SansSerifSmall" h_pad="0" halign="left" height="16" left="27"
+        mouse_opaque="true" name="avatars_in" v_pad="0"
+        width="220">
+      Avatars in
+    </text>
+    <slider bottom_delta="0" left_delta="55" follows="left|top" width="110" height="15"
+         name="near_me_range" label="" control_name="NearMeRange"
+         min_val="5" max_val="512" increment="1" initial_val="96" decimal_digits="0" />
+    <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+         bottom_delta="0" left="190" drop_shadow_visible="true" follows="left|top"
+         font="SansSerifSmall" h_pad="0" halign="left" height="15"
+         mouse_opaque="true" name="meters" v_pad="0"
+         width="40">
+      Meters
+    </text>
+    <tab_container border="false" bottom_delta="-176" height="172" left="0" mouse_opaque="false"
+                       name="button_container" tab_position="top" follows="left|right|bottom" width="198">
+      <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
+                       label="Avatars" left="1" mouse_opaque="true" name="avatar_tab" width="198">
+        <button bottom="-25" follows="top|right" height="22" label="IM/Call"
+             left="-85" name="im_btn" tool_tip="Open Instant Message session"
+             width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Profile"
+             left_delta="0" name="profile_btn"
+             tool_tip="Show picture, groups, and other information" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Teleport..."
+             left_delta="0" name="offer_teleport_btn"
+             tool_tip="Offer this friend a teleport to your current location" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Track"
+             left_delta="0" name="track_btn"
+             tool_tip="Create a beacon to track this avatar" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Invite..."
+             left_delta="0" name="invite_btn"
+             tool_tip="Remove this person from your friends list" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Add..."
+             left_delta="0" name="add_btn" tool_tip="Offer friendship to a resident"
+             width="80" />
+      </panel>
+      <panel border="true" bottom="-160" follows="left|top|right|bottom" height="160"
+                       label="Estate" left="1" mouse_opaque="true" name="estate_tab" width="198">
+        <button bottom="-25" follows="top|right" height="22" label="Freeze..."
+             left="-85" name="freeze_btn" tool_tip=""
+             width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Eject..."
+             left_delta="0" name="eject_btn"
+             tool_tip="" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Mute..."
+             left_delta="0" name="mute_btn"
+             tool_tip="" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Unmute..."
+             left_delta="0" name="unmute_btn"
+             tool_tip="" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Report..."
+             left_delta="0" name="ar_btn"
+             tool_tip="" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Kick..."
+             left_delta="0" name="estate_eject_btn" tool_tip=""
+             width="80" />
+      </panel>
+    </tab_container>
+    <scroll_list bottom="-190" width="104" height="143" left="4"
+         follows="left|bottom|right" draw_border="false" draw_heading="true"
+         draw_stripes="true" column_padding="5" sort_column="1" mouse_opaque="true"
+         background_visible="true" multi_select="false" name="RadarList">
+      <column name="avatar_name" label="Name" dynamicwidth="true" />
+      <column name="avatar_distance" label="Dist." width="48" />
+    </scroll_list>
+  </panel>
+  <string name="no_one_near">
+    No avatars within range
+  </string>
+  <string name="muted">
+    (muted)
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_object_im_info.xml b/linden/indra/newview/skins/default/xui/en-us/floater_object_im_info.xml
new file mode 100644
index 0000000..615b7d1
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_object_im_info.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="0" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" can_tear_off="true" enabled="true" height="140" left="0"
+     mouse_opaque="true" name="object im info" width="300"
+     rect_control="FloaterObjectIMInfo" short_title="Object Info" title="Object Information" >
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-35" drop_shadow_visible="true" follows="left|top"
+             font="SansSerif" h_pad="0" halign="left" height="10" left="10"
+             mouse_opaque="true" name="LabelItemNameTitle" v_pad="0" width="78">
+    Object:
+  </text>
+  <text bevel_style="none" border_style="line" border_visible="false"
+                             border_thickness="0" bottom_delta="-10" enabled="true" follows="left|top"
+                             font="SansSerif" height="20" is_unicode="false" left="70"
+                             max_length="254" mouse_opaque="false" name="ObjectName"
+                             width="200" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-60" drop_shadow_visible="true" follows="left|top"
+             font="SansSerif" h_pad="0" halign="left" height="10" left="10"
+             mouse_opaque="true" name="LabelSlurlTitle" v_pad="0" width="78">
+    Location:
+  </text>
+  <text bevel_style="none" border_style="line" border_visible="false"
+                             border_thickness="0" bottom_delta="-10" enabled="true" follows="left|top"
+                             font="SansSerif" height="20" is_unicode="false" left="70" hover="true"
+                             max_length="254" mouse_opaque="true" name="Slurl" font-style="UNDERLINE"
+                             width="200" hover_cursor="UI_CURSOR_HAND" text_color="TextLinkColor" hover_color="TextLinkHoverColor"/>
+
+  <!-- A new viewer talking to an old sim will not have a slurl available and will show this. -->
+  <text bevel_style="none" border_style="line" border_visible="false"
+                             border_thickness="0" bottom_delta="0" enabled="true" follows="left|top"
+                             font="SansSerif" height="20" is_unicode="false" left_delta="0" hover="false"
+                             max_length="254" mouse_opaque="false" name="Unknown_Slurl" width="200">
+    (Location Info Not Available)
+  </text>
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-85" drop_shadow_visible="true" follows="left|top"
+             font="SansSerif" h_pad="0" halign="left" height="10" left="10"
+             mouse_opaque="true" name="LabelOwnerNameTitle" v_pad="0" width="78">
+    Owner:
+  </text>
+  <text bevel_style="none" border_style="line" border_visible="false"
+                             border_thickness="0" bottom_delta="-10" enabled="true" follows="left|top"
+                             font="SansSerif" height="20" is_unicode="false" left="70" hover="true"
+                             max_length="254" mouse_opaque="true" name="OwnerName" font-style="UNDERLINE"
+                             width="200" hover_cursor="UI_CURSOR_HAND" text_color="TextLinkColor" hover_color="TextLinkHoverColor"/>
+
+  <button bottom_delta="-30" font="SansSerif" halign="center" height="20" label="Mute Owner"
+         label_selected="Mute Owner" left="70" mouse_opaque="true" name="Mute"
+         width="160" />
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_profile.xml b/linden/indra/newview/skins/default/xui/en-us/floater_profile.xml
index daf45cf..c67443f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_profile.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_profile.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="520" min_height="0" min_width="0"
+     can_resize="false" height="545" min_height="0" min_width="0"
      name="avatarinfo" title="Profile" width="420">
-        <panel bottom="-520" height="486" left="0" name="Panel Avatar" width="430" />
+        <panel bottom="-545" height="511" left="0" name="Panel Avatar" width="430" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
index a9ac7fa..9333153 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="false"
+<floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="false" follows="left|top" height="526" name="Snapshot"
      rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="215">
         <text bottom_delta="-40" follows="top|left" height="15" left="10" name="type_label"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index bc18f44..a57c568 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -660,15 +660,15 @@
                         </text>
                         <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="X" label_width="10" left="10"
-                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale X"
+                             min_val="0.01" mouse_opaque="true" name="Scale X"
                              text_enabled_color="1, 1, 1, 1" width="96" />
                         <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
-                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Y"
+                             min_val="0.01" mouse_opaque="true" name="Scale Y"
                              text_enabled_color="1, 1, 1, 1" width="96" />
                         <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
-                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Z"
+                             min_val="0.01" mouse_opaque="true" name="Scale Z"
                              text_enabled_color="1, 1, 1, 1" width="96" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
index 906e7de..471b3e5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
@@ -4,29 +4,35 @@
      min_width="400" mouse_opaque="true" name="WindLight floater"
      rect_control="FloaterAdvancedSkyRect" title="Advanced Sky Editor"
      width="700">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-50" drop_shadow_visible="true" follows="left|top|right"
              font="SansSerif" h_pad="0" halign="left" height="16"
              left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
              width="110">
-                Sky Presets:
-        </text>
-        <combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18"
+    Sky Presets:
+  </text>
+  <combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18"
              left_delta="110" max_chars="20" mouse_opaque="true" name="WLPresetsCombo"
              width="150" />
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+             label="" label_selected="" left_delta="-25" image_overlay="arrow_left.tga"
+             mouse_opaque="true" name="prev" scale_image="true" width="20" />
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+             label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga"
+             mouse_opaque="true" name="next" scale_image="true" width="20" />
         <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="New" label_selected="New" left_delta="170"
+             label="New" label_selected="New" left_delta="40"
              mouse_opaque="true" name="WLNewPreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Save" label_selected="Save" left_delta="80"
+             label="Save" label_selected="Save" left_delta="70"
              mouse_opaque="true" name="WLSavePreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Delete" label_selected="Delete" left_delta="80"
+             label="Delete" label_selected="Delete" left_delta="70"
              mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
              label="Day Cycle Editor" label_selected="Day Cycle Editor"
-             left_delta="120" mouse_opaque="true" name="WLDayCycleMenuButton"
-             scale_image="true" width="120" />
+             left_delta="100" mouse_opaque="true" name="WLDayCycleMenuButton"
+             scale_image="true" width="125" />
         <tab_container bottom="-220" follows="left|top" height="160" left="0"
              mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700">
                 <panel border="true" bottom="-220" follows="left|top|right|bottom" height="160"
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
index 485ae9f..0172b41 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
@@ -19,6 +19,11 @@
     <on_click function="MiniMap.Center" userdata="1" />
     <on_check function="MiniMap.CheckCenter" userdata="1" />
   </menu_item_check>
+  <menu_item_check bottom_delta="-18" enabled="true" height="18" label="Rotate Mini-Map"
+          left="0" mouse_opaque="true" name="Rotate Mini-Map" width="128">
+    <on_click function="MiniMap.Rotate" userdata="" />
+    <on_check function="MiniMap.CheckRotate" userdata="" />
+  </menu_item_check>
   <menu_item_separator />
   <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Show Map"
                  left="0" mouse_opaque="true" name="Show Map" width="128">
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index 99fe75a..01e2546 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -835,6 +835,11 @@ Use the controls on the right to find things
 and display different backgrounds.
                 </message>
         </notify>
+  <notify name="FirstMiniMap" tip="false">
+    <message name="message">
+      Right-click the Mini-Map for more options.
+    </message>
+  </notify>
         <notify name="FirstBuild" tip="false">
                 <message name="message">
                         You can build new objects in some areas of [SECOND_LIFE].
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 a3a4b1a..2ea8890 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
@@ -1,430 +1,414 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="-550" height="486" left="350" name="Panel Avatar" width="430">
-        <tab_container bottom="-486" height="486" left="0" mouse_opaque="false" name="tab"
+<panel bottom="-575" height="511" left="350" name="Panel Avatar" width="430">
+  <tab_container bottom="-511" height="511" left="0" mouse_opaque="false" name="tab"
              tab_min_width="50" tab_position="top" width="419">
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+    <panel border="true" bottom="-507" follows="left|top|right|bottom" height="491"
                      label="2nd Life" left="1" mouse_opaque="true" name="2nd Life" width="418">
-                        <string name="CaptionTextAcctInfo">
-                                [ACCTTYPE]
+      <string name="CaptionTextAcctInfo">
+[ACCTTYPE]
 [PAYMENTINFO]
 [AGEVERIFICATION]
-                        </string>
-                        <string name="AcctTypeResident">
-                                Resident
-                        </string>
-                        <string name="AcctTypeTrial">
-                                Trial
-                        </string>
-                        <string name="AcctTypeCharterMember">
-                                Charter Member
-                        </string>
-                        <string name="AcctTypeEmployee">
-                                Linden Lab Employee
-                        </string>
-                        <string name="PaymentInfoUsed">
-                                Payment Info Used
-                        </string>
-                        <string name="PaymentInfoOnFile">
-                                Payment Info On File
-                        </string>
-                        <string name="NoPaymentInfoOnFile">
-                                No Payment Info On File
-                        </string>
-                        <string name="AgeVerified">
-                                Age-verified
-                        </string>
-                        <string name="NotAgeVerified">
-                                Not Age-verified
-                        </string>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Name:" v_pad="0" width="70">
-                                Name:
-                        </text>
-                        <name_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom="-24" enabled="false" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"
-                             max_length="254" mouse_opaque="false" name="name"
-                             width="180" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifsmall" h_pad="0" halign="left" height="16" left="279"
-                             mouse_opaque="true" name="online_yes" v_pad="0" width="121">
-                                Currently Online
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
-                             mouse_opaque="true" name="label" v_pad="0" width="121">
-                                Born:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line"
+      </string>
+      <string name="AcctTypeResident">
+        Resident
+      </string>
+      <string name="AcctTypeTrial">
+        Trial
+      </string>
+      <string name="AcctTypeCharterMember">
+        Charter Member
+      </string>
+      <string name="AcctTypeEmployee">
+        Linden Lab Employee
+      </string>
+      <string name="PaymentInfoUsed">
+        Payment Info Used
+      </string>
+      <string name="PaymentInfoOnFile">
+        Payment Info On File
+      </string>
+      <string name="NoPaymentInfoOnFile">
+        No Payment Info On File
+      </string>
+      <string name="AgeVerified">
+        Age-verified
+      </string>
+      <string name="NotAgeVerified">
+        Not Age-verified
+      </string>
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-23" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifsmall" h_pad="0" halign="left" height="16" right="-15"
+                             mouse_opaque="true" name="online_yes" v_pad="0" width="130">
+        Currently: Online
+      </text>
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifsmall" h_pad="0" halign="left" height="16" left_delta="0"
+                             mouse_opaque="true" name="online_no" v_pad="0" width="130">
+        Currently: Offline
+      </text>
+      <button bottom_delta="-19" font="SansSerif" halign="center" height="20"
+                             label="Instant Message..." label_selected="Instant Message..."
+                             right="-15" mouse_opaque="true" name="Instant Message..."
+                             tool_tip="Instant Message (IM)" width="130" />
+      <button bottom_delta="-23" font="SansSerif" halign="center" height="20"
+                             label="Offer Teleport..." label_selected="Offer Teleport..."
+                             left_delta="0" mouse_opaque="true" name="Offer Teleport..." width="130" />
+      <button bottom_delta="-34" font="SansSerif" halign="center" height="20"
+                             label="Add to Friends..." label_selected="Add to Friends..." left_delta="0"
+                             mouse_opaque="true" name="Add Friend..." width="130" />
+      <button bottom_delta="-23" font="SansSerif" halign="center" height="20"
+                             label="Invite to Group..." label_selected="Invite to Group..." left_delta="0"
+                             mouse_opaque="true" name="Invite to Group..." width="130" />
+      <button bottom_delta="-23" font="SansSerif" halign="center" height="20" label="Find on Map"
+                             label_selected="Find on Map" left_delta="0" mouse_opaque="true"
+                             name="Find on Map" width="130" />
+      <button bottom_delta="-34" font="SansSerif" halign="center" height="20" label="Pay..."
+                             label_selected="Pay..." left_delta="0" mouse_opaque="true" name="Pay..."
+                             width="130" />
+      <button bottom_delta="-23" font="SansSerif" halign="center" height="20" label="Mute"
+                             label_selected="Mute" left_delta="0" mouse_opaque="true" name="Mute"
+                             width="130" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-29" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-15"
+                             mouse_opaque="true" name="label" v_pad="0" width="130">
+        Born:
+      </text>
+      <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="279"
+                             font="SansSerifSmall" height="18" is_unicode="false" right="-15"
                              max_length="254" mouse_opaque="false" name="born"
-                             width="121" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
-                             mouse_opaque="true" name="label2" v_pad="0" width="121">
-                                Account:
-                        </text>
-                        <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="48" left="279"
-                             mouse_opaque="false" name="acct_border" width="121" />
-                        <text bg_visible="false" border_drop_shadow_visible="false"
+                             width="130" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-15"
+                             mouse_opaque="true" name="label2" v_pad="0" width="130">
+        Account:
+      </text>
+      <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="50" right="-15"
+                             mouse_opaque="false" name="acct_border" width="130" />
+      <text bg_visible="false" border_drop_shadow_visible="false"
                              border_visible="true" bottom_delta="0" drop_shadow_visible="true"
                              follows="left|top" font="SansSerifSmall" height="48" left="279"
                              mouse_opaque="false" name="acct" width="121" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-15"
                              mouse_opaque="true" name="partner_label"
                              tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
                              v_pad="0" width="130">
-                                Partner:
-                        </text>
-                        <button bottom_delta="2" follows="left|top" font="SansSerif" halign="center"
+        Partner:
+      </text>
+      <button bottom_delta="1" follows="left|top" font="SansSerif" halign="center"
                              height="18" label="i" label_selected="i" left_delta="44"
                              mouse_opaque="true" name="partner_info"
-                             tool_tip="Click to open partner&apos;s profile" width="18" />
-                        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+                             tool_tip="Click to open partner&apos;s profile" width="20" />
+      <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
                              height="18" label="?" label_selected="?" left_delta="24"
-                             mouse_opaque="true" name="partner_help" width="18" />
-                        <line_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="279"
+                             mouse_opaque="true" name="partner_help" width="20" />
+      <line_editor bevel_style="in" border_style="line"
+                             border_thickness="1" bottom_delta="-19" enabled="true" follows="left|top"
+                             font="SansSerifSmall" height="18" is_unicode="false" right="-15"
                              max_length="254" mouse_opaque="false" name="partner_edit"
                              tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
-                             width="121">
-                                [FIRST] [LAST]
-                        </line_editor>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-44" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Photo:" v_pad="0" width="70">
-                                Photo:
-                        </text>
-                        <texture_picker allow_no_texture="true" bottom="-179" can_apply_immediately="false"
-                             default_image_name="None" follows="left|top" height="151" label=""
-                             left="79" mouse_opaque="true" name="img"
-                             tool_tip="Click to choose a picture" width="180" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-183" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Groups:" v_pad="0" width="70">
-                                Groups:
-                        </text>
-                        <scroll_list background_visible="true" bottom="-258" column_padding="5" draw_border="true"
-                             follows="left|top" height="90" left="79" mouse_opaque="false"
-                             multi_select="false" name="groups" width="321" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-280" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="About:" v_pad="0" width="70">
-                                About:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
-                             mouse_opaque="true" name="(500 chars)" v_pad="0" width="70">
-                                (500 chars)
-                        </text>
-                        <text_editor bottom="-375" embedded_items="false"
-                             enabled="true" follows="left|top" font="SansSerifSmall" height="110"
-                             is_unicode="false" left="79" max_length="511" mouse_opaque="true"
-                             name="about" width="321" word_wrap="true" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-403" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
-                             mouse_opaque="true" name="Give item:" v_pad="0" width="75">
-                                Give item:
-                        </text>
-                        <view_border blevel_style="in" border_thickness="0" bottom="-466" follows="left|top"
-                             height="466" left_delta="4" mouse_opaque="false" name="drop_target_rect"
-                             width="409" />
-                        <view_border blevel_style="in" bottom="-403" follows="left|top" height="16" left_delta="75"
-                             mouse_opaque="false" name="drop_target_rect_vis" width="321" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" left_delta="0"
+                             width="130">
+        [FIRST] [LAST]
+      </line_editor>
+      <texture_picker allow_no_texture="true" bottom="289" can_apply_immediately="false"
+                             default_image_name="None" follows="left|top" height="192" label=""
+                             left="20" mouse_opaque="true" name="img" scale_image="false" auto-resize="false"
+                             tool_tip="Click to choose a picture" width="235" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-6" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
+                             mouse_opaque="true" name="About:" v_pad="0" width="170">
+        About (500 chars):
+      </text>
+      <text_editor bottom_delta="-155" embedded_items="false"
+                             enabled="true" follows="left|top" font="SansSerifSmall" height="155"
+                             is_unicode="false" left_delta="0" max_length="511" mouse_opaque="true"
+                             name="about" width="235" word_wrap="true" />
+
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" halign="left" height="16" left="20"
+                             mouse_opaque="true" name="Groups:" width="70">
+        Groups:
+      </text>
+      <scroll_list background_visible="true" bottom_delta="-80" column_padding="5" draw_border="true"
+                             follows="left|top" height="80" left_delta="0" mouse_opaque="false"
+                             multi_select="false" name="groups" width="235" />
+      <view_border blevel_style="in" bottom_delta="0" follows="left|top" height="80" right="-15"
+                             mouse_opaque="false" name="drop_target_rect_vis" width="130" />
+      <view_border blevel_style="in" border_thickness="0" bottom_delta="0" follows="left|top"
+                             height="80" left_delta="0" mouse_opaque="false" name="drop_target_rect"
+                             width="130" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="40" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16" right="-22"
                              mouse_opaque="true" name="Give inventory"
-                             tool_tip="Drop inventory items here to give them to this person." v_pad="2"
-                             width="321">
-                                Drop inventory item here.
-                        </text>
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Show in search" left="75" mouse_opaque="true"
+                             tool_tip="Drop inventory items here to give them to this resident." v_pad="2"
+                             width="115">
+        Drop inventory here
+      </text>
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16" left_delta="0"
+                             mouse_opaque="true" name="Give inventory 2" width="115"
+                             tool_tip="Drop inventory items here to give them to this resident.">
+        to give to resident
+      </text>
+      <name_editor bevel_style="in" border_style="line"
+                             border_thickness="0" bottom="0" enabled="false" follows="left|top"
+                             font="SansSerifSmall" height="0" is_unicode="false" left="1"
+                             max_length="254" mouse_opaque="false" name="name"
+                             width="0" />
+      <check_box bottom="1" follows="left|top" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Show profile in search" left="18" mouse_opaque="true"
                              name="allow_publish"
                              tool_tip="Publish extra profile information such as description and image in Search."
                              width="130" />
-                        <button bottom="-425" follows="left|top" font="SansSerif" halign="center" height="20"
-                             label="?" label_selected="?" left_delta="145" mouse_opaque="true" name="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="18"
+                             label="?" label_selected="?" left_delta="150" mouse_opaque="true" name="?"
                              width="20" />
-                        <button bottom="-428" font="SansSerif" halign="center" height="20" label="Find on Map"
-                             label_selected="Find on Map" left="24" mouse_opaque="true"
-                             name="Find on Map" width="100" />
-                        <button bottom="-428" font="SansSerif" halign="center" height="20"
-                             label="Offer Teleport..." label_selected="Offer Teleport..."
-                             left_delta="102" mouse_opaque="true" name="Offer Teleport..." width="140" />
-                        <button bottom="-428" font="SansSerif" halign="center" height="20"
-                             label="Add Friend..." label_selected="Add Friend..." left_delta="142"
-                             mouse_opaque="true" name="Add Friend..." width="130" />
-                        <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Pay..."
-                             label_selected="Pay..." left="24" mouse_opaque="true" name="Pay..."
-                             width="100" />
-                        <button bottom_delta="0" font="SansSerif" halign="center" height="20"
-                             label="Instant Message..." label_selected="Instant Message..."
-                             left_delta="102" mouse_opaque="true" name="Instant Message..."
-                             tool_tip="Instant Message (IM)" width="140" />
-                        <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Mute"
-                             label_selected="Mute" left_delta="142" mouse_opaque="true" name="Mute"
-                             width="130" />
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-                       label="Web" left="1" mouse_opaque="true" name="WebProfile" width="418">
-                  <line_editor bevel_style="in" border_style="line"
+    </panel>
+    <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+                     label="Web" left="1" mouse_opaque="true" name="WebProfile" width="418">
+      <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom_delta="-18" enabled="false" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left="10"
                              max_length="254" mouse_opaque="true" name="url_edit"
                              width="400" />
       <flyout_button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
                              height="18" label="Load" label_selected="Load" left="10"
-                             mouse_opaque="true" name="load" enabled="false" 
+                             mouse_opaque="true" name="load" enabled="false"
                              tool_tip="Load this profile page with embedded web browser." width="80" >
         <flyout_button_item value="open" name="open_item">In external browser</flyout_button_item>
         <flyout_button_item value="home" name="home_item">Home URL</flyout_button_item>
       </flyout_button>
-                        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+      <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
                              height="18" label="?" label_selected="?" left_delta="85"
                              mouse_opaque="true" name="web_profile_help" width="18" />
-                        <check_box bottom_delta="0" follows="right|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="0" follows="right|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Automatically load web profiles"
                              left_delta="30" mouse_opaque="true" name="auto_load"
                              tool_tip="Automatically load ALL profile webpages without asking first."
                              width="127" />
-                        <web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400"
+      <web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400"
                              ignore_ui_scale="false" left="10" name="profile_html" start_url=""
                              width="400" />
-                        <text bottom="5" follows="bottom|left|right" left="15" name="status_text" right="-70"
+      <text bottom="5" follows="bottom|left|right" left="15" name="status_text" right="-70"
                              top="25" />
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+    </panel>
+    <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                      label="Interests" left="1" mouse_opaque="true" name="Interests" width="418">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-36" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
                              mouse_opaque="true" name="I Want To:" v_pad="0" width="70">
-                                I Want To:
-                        </text>
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+        I Want To:
+      </text>
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Build" left_delta="70" mouse_opaque="true"
                              name="chk0" width="90" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Explore" left_delta="170" mouse_opaque="true"
                              name="chk1" width="90" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Meet" left_delta="-170" mouse_opaque="true"
                              name="chk2" width="57" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Be Hired" left_delta="170" mouse_opaque="true"
                              name="chk6" width="92" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Group" left_delta="-170" mouse_opaque="true"
                              name="chk3" width="90" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Buy" left_delta="170" mouse_opaque="true"
                              name="chk4" width="90" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Sell" left_delta="-170" mouse_opaque="true"
                              name="chk5" width="50" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Hire" left_delta="170" mouse_opaque="true"
                              name="chk7" width="92" />
-                        <line_editor bevel_style="in" border_style="line"
+      <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left="74"
                              max_length="254" mouse_opaque="true" name="want_to_edit"
                              width="330" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
                              mouse_opaque="true" name="Skills:" v_pad="0" width="70">
-                                Skills:
-                        </text>
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+        Skills:
+      </text>
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Textures" left_delta="70" mouse_opaque="true"
                              name="schk0" width="90" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Architecture" left_delta="170"
                              mouse_opaque="true" name="schk1" width="93" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Event Planning" left_delta="0"
                              mouse_opaque="true" name="schk2" width="105" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Modeling" left_delta="-170"
                              mouse_opaque="true" name="schk3" width="90" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Scripting" left_delta="0" mouse_opaque="true"
                              name="schk4" width="90" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Custom Characters" left_delta="170"
                              mouse_opaque="true" name="schk5" width="127" />
-                        <line_editor bevel_style="in" border_style="line"
+      <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left="74"
                              max_length="254" mouse_opaque="true" name="skills_edit"
                              width="330" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
                              mouse_opaque="true" name="Languages:" v_pad="0" width="70">
-                                Languages:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line"
+        Languages:
+      </text>
+      <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom_delta="0" enabled="true" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left="74"
                              max_length="254" mouse_opaque="true" name="languages_edit"
                              width="330" />
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+    </panel>
+    <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                      label="Picks" left="1" mouse_opaque="true" name="Picks" width="418">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
                              mouse_opaque="true"
                              name="Tell everyone about your favorite places in Second Life." v_pad="0"
                              width="302">
-                                Tell everyone about your favorite places in Second Life.
-                        </text>
-                        <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+        Tell everyone about your favorite places in Second Life.
+      </text>
+      <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
                              height="20" label="New..." label_selected="New..." left="114"
                              mouse_opaque="true" name="New..." width="75" />
-                        <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
+      <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="Delete..." label_selected="Delete..." left_delta="79"
                              mouse_opaque="true" name="Delete..." width="75" />
-                        <tab_container bottom="-411" follows="left|top" height="363" left="4" mouse_opaque="false"
+      <tab_container bottom="-411" follows="left|top" height="363" left="4" mouse_opaque="false"
                              name="picks tab" tab_position="left" width="412" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"
                              h_pad="0" halign="left" height="20" left="114" mouse_opaque="false"
                              name="loading_text" v_pad="0" width="302">
-                                Loading...
-                        </text>
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+        Loading...
+      </text>
+    </panel>
+    <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                      label="Classified" left="1" mouse_opaque="true" name="Classified"
                      width="418">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
                              mouse_opaque="true"
                              name="Place an ad in Second Life&apos;s classified listings." v_pad="0"
                              width="302">
-                                Place an ad in Second Life&apos;s classified listings.
-                        </text>
-                        <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+        Place an ad in Second Life&apos;s classified listings.
+      </text>
+      <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
                              height="20" label="New..." label_selected="New..." left="114"
                              mouse_opaque="true" name="New..." width="75" />
-                        <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
+      <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="Delete..." label_selected="Delete..." left_delta="79"
                              mouse_opaque="true" name="Delete..." width="75" />
-                        <tab_container bottom="-443" follows="left|top" height="395" left="4" mouse_opaque="false"
+      <tab_container bottom="-443" follows="left|top" height="395" left="4" mouse_opaque="false"
                              name="classified tab" tab_position="left" width="412" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"
                              h_pad="0" halign="left" height="20" left="114" mouse_opaque="false"
                              name="loading_text" v_pad="0" width="302">
-                                Loading...
-                        </text>
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+        Loading...
+      </text>
+    </panel>
+    <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                      label="1st Life" left="1" mouse_opaque="true" name="1st Life" width="418">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-36" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Photo:" v_pad="0" width="61">
-                                Photo:
-                        </text>
-                        <texture_picker allow_no_texture="true" bottom="-171" can_apply_immediately="false"
-                             default_image_name="None" follows="left|top" height="151" label=""
-                             left="70" mouse_opaque="true" name="img"
-                             tool_tip="Click to choose a picture" width="135" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-203" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Info:" v_pad="0" width="61">
-                                Info:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
-                             mouse_opaque="true" name="(250 chars)" v_pad="0" width="65">
-                                (250 chars)
-                        </text>
-                        <text_editor bottom="-347" embedded_items="false"
-                             enabled="true" follows="left|top" font="SansSerifSmall" height="160"
-                             is_unicode="false" left="70" max_length="254" mouse_opaque="false"
-                             name="about" width="330" word_wrap="true" />
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+      <texture_picker allow_no_texture="true" bottom="220" can_apply_immediately="false"
+                             default_image_name="None" follows="left|top" height="235" label=""
+                             left="20" mouse_opaque="true" name="img"
+                             tool_tip="Click to choose a picture" width="235" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-8" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="20"
+                             mouse_opaque="true" name="Info:" v_pad="0" width="161">
+        Info (250 chars):
+      </text>
+      <text_editor bottom_delta="-179" embedded_items="false"
+                             enabled="true" follows="left|top" font="SansSerifSmall" height="178"
+                             is_unicode="false" left="20" max_length="254" mouse_opaque="false"
+                             name="about" width="378" word_wrap="true" />
+    </panel>
+    <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                      label="My Notes" left="1" mouse_opaque="true" name="My Notes" width="418">
-                        <string name="Loading">
-                                Loading...
-                        </string>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <string name="Loading">
+        Loading...
+      </string>
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-52" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="48" left="10"
                              mouse_opaque="true" name="label" v_pad="0" width="412">
-                                Use this space to record your notes about this person.  Keep track
-of trades in progress, joint projects, etc.  Only you can see these
-notes.  This person cannot see them, nor can other people.
-                        </text>
-                        <text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top"
+        Use this space to record your notes about this person.  Keep track
+        of trades in progress, joint projects, etc.  Only you can see these
+        notes.  This person cannot see them, nor can other people.
+      </text>
+      <text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top"
                              font="SansSerif" height="256" is_unicode="false" left="10"
                              max_length="1023" mouse_opaque="true" name="notes edit" width="400"
                              word_wrap="false" />
-                </panel>
-        </tab_container>
-        <button bottom="-483" font="SansSerif" halign="center" height="20" label="OK"
+    </panel>
+  </tab_container>
+  <button bottom="-508" font="SansSerif" halign="center" height="20" label="OK"
              label_selected="OK" left="208" mouse_opaque="true" name="OK" width="100" />
-        <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Cancel"
+  <button bottom="-508" font="SansSerif" halign="center" height="20" label="Cancel"
              label_selected="Cancel" left_delta="105" mouse_opaque="true" name="Cancel"
              width="100" />
-        <button bottom_delta="132" font="SansSerif" halign="center" height="20" label="Kick"
+  <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Kick"
              label_selected="Kick" left="4" mouse_opaque="true" name="Kick" width="72" />
-        <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Freeze"
-             label_selected="Freeze" left="4" mouse_opaque="true" name="Freeze"
+  <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Freeze"
+             label_selected="Freeze" left_delta="76" mouse_opaque="true" name="Freeze"
              tool_tip="Stop this resident&apos;s movement and chat." width="72" />
-        <button bottom_delta="-24" font="SansSerif" halign="center" height="20"
-             label="Unfreeze" label_selected="Unfreeze" left="4" mouse_opaque="true"
+  <button bottom_delta="0" font="SansSerif" halign="center" height="20"
+             label="Unfreeze" label_selected="Unfreeze" left_delta="76" mouse_opaque="true"
              name="Unfreeze" tool_tip="Thaw resident" width="72" />
-        <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="CSR"
-             label_selected="CSR" left="4" mouse_opaque="true" name="csr_btn"
+  <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="CSR"
+             label_selected="CSR" left_delta="76" mouse_opaque="true" name="csr_btn"
              tool_tip="Open customer service tool for this resident" width="72" />
-        <string name="ShowOnMapNonFriend">
-                Show location on the map.
-Disabled because you have not
-formed a friendship with them.
-        </string>
-        <string name="ShowOnMapFriendOffline">
-                Show location on the map.
+  <string name="ShowOnMapNonFriend">
+    Show location on the map.
+    Disabled because you have not
+    formed a friendship with them.
+  </string>
+  <string name="ShowOnMapFriendOffline">
+    Show location on the map.
     Disabled because they are not online.
-        </string>
-        <string name="ShowOnMapFriendOnline">
-                Show location on the map.
-        </string>
-        <string name="TeleportGod">
-                Force a teleport to your location.
-        </string>
-        <string name="TeleportPrelude">
-                Offer a teleport to your location.
-Disabled until you leave Orientation Island.
-        </string>
-        <string name="TeleportNormal">
-                Offer a teleport to your location.
-        </string>
-        <string name="Loading">
-                Loading...
-        </string>
+  </string>
+  <string name="ShowOnMapFriendOnline">
+    Show location on the map.
+  </string>
+  <string name="TeleportGod">
+    Force a teleport to your location.
+  </string>
+  <string name="TeleportPrelude">
+    Offer a teleport to your location.
+    Disabled until you leave Orientation Island.
+  </string>
+  <string name="TeleportNormal">
+    Offer a teleport to your location.
+  </string>
+  <string name="Loading">
+    Loading...
+  </string>
+  <string name="HiddenLabel">
+    (hidden)
+  </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
index 1a93341..19faa62 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel background_opaque="false" background_visible="true" bg_alpha_color="NetMapBackgroundColor"
-         border="false" follows="left|top|right|bottom" height="216" label="Mini Map"
+         border="false" follows="left|top|right|bottom" height="716" label="Mini Map"
          mouse_opaque="false" name="mini_mapview" width="196">
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                  bottom="-40" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
index e785909..8ad4fff 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
@@ -45,16 +45,21 @@
                                      use_bounding_rect="true" width="395" />
                         </layout_stack>
                 </layout_panel>
-                <layout_panel auto_resize="false" bottom="0" left="0" min_width="220" mouse_opaque="false"
+    <layout_panel auto_resize="false" bottom="0" left="0" min_width="184" mouse_opaque="false"
+                        name="windlight_remote_container" use_bounding_rect="true" user_resize="false"
+                        width="186">
+      <panel background_visible="false" border="false" bottom="0" name="windlight_remote" />
+    </layout_panel>
+    <layout_panel auto_resize="false" bottom="0" left="0" min_width="220" mouse_opaque="false"
                      name="media_remote_container" use_bounding_rect="true" user_resize="false"
                      width="220">
-                        <panel background_visible="false" border="false" bottom="0" name="media_remote" />
-                </layout_panel>
-                <layout_panel auto_resize="false" bottom="0" left="0" min_width="130" mouse_opaque="false"
+      <panel background_visible="false" border="false" bottom="0" name="media_remote" />
+    </layout_panel>
+    <layout_panel auto_resize="false" bottom="0" left="0" min_width="130" mouse_opaque="false"
                      name="voice_remote_container" use_bounding_rect="true" user_resize="false"
                      width="128">
-                        <panel background_visible="false" border="false" bottom="0" name="voice_remote" />
-                </layout_panel>
+      <panel background_visible="false" border="false" bottom="0" name="voice_remote" />
+    </layout_panel>
         </layout_stack>
   <string name="unread_count_string_plural">
     New IMs
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 92978ab..c960d36 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -15,7 +15,7 @@
                 Streaming Preferences:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-280" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-300" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
                 Audio Preferences:
@@ -28,6 +28,10 @@
              label="Play Streaming Music When Available (uses more bandwidth)"
              left="142" mouse_opaque="true" name="streaming_music" radio_style="false"
              width="339" />
+  <check_box bottom_delta="-20" control_name="ShowStreamTitle" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+             label="Show stream info in chat" left="162" mouse_opaque="true"
+       name="show_stream_title" radio_style="false" width="338" />
         <check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Play Streaming Media When Available (uses more bandwidth)"
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 ea04dfc..e8a2625 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
@@ -73,10 +73,6 @@
              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" />
-        <check_box bottom="-286" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Rotate Mini-Map" left="151" mouse_opaque="true"
-             name="rotate_mini_map_checkbox" radio_style="false" width="256" />
         <check_box bottom="-304" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Notify when Linden dollars (L$) spent or received" left="151"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 527309e..d5d43b1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -8,6 +8,10 @@
              height="16" initial_value="false"
              label="Run Second Life in a window" left="10" mouse_opaque="true"
              name="windowed mode" radio_style="false" width="100" />
+  <check_box bottom_delta="0" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+       label="Show environment control in toolbar" left="248" mouse_opaque="true"
+             name="toggle_windlight_control" radio_style="false" width="237" />
         <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-43"
              embedded_items="false" enabled="false" follows="left|top"
              font="SansSerifSmall" height="20" hide_border="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index 48da432..d4ec307 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -10,8 +10,8 @@
         </text>
         <slider bottom_delta="-25" can_edit_text="true"
              decimal_digits="0" enabled="true" follows="left|top" height="15"
-             increment="10" initial_val="50" left_delta="0" max_val="1500" min_val="50"
-             mouse_opaque="true" name="max_bandwidth" show_text="true" value="500"
+             increment="10" initial_val="1000" left_delta="0" max_val="5000" min_val="50"
+             mouse_opaque="true" name="max_bandwidth" show_text="true" value="1000"
              width="180" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="4" drop_shadow_visible="true" enabled="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml
new file mode 100644
index 0000000..b9c6fc3
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="1"
+     enabled="true" follows="right|bottom" height="20" left="0"
+     name="windlight_controls" width="182">
+  <button bottom="-21" follows="left|bottom" font="SansSerif" halign="center" height="20"
+             label="Editor" left="4" name="Environment"
+             tool_tip="Click here to adjust world environment" width="80" />
+  <flyout_button bottom="-21" follows="left|bottom" height="20" label="Sky" left_delta="82" width="71"
+       list_position="above" mouse_opaque="true" name="Presets" tool_tip="Windlight presets">
+  </flyout_button>
+  <button bottom="-22" follows="left|bottom" font="SansSerif" halign="center" height="22" toggle="true" 
+             label="" left_delta="72" name="Popup" scale_image="true" control_name="ShowWindlightSettingsPopup" 
+       tool_tip="Click here to adjust draw distance" width="22" />
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
new file mode 100644
index 0000000..ead9ad7
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="0"
+     enabled="true" follows="right|bottom" height="20" left="0" mouse_opaque="true"
+     name="windlight_remote" use_bounding_rect="true" width="182">
+        <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="22" left="0" width="182" />
+        <panel bottom="3" filename="panel_windlight_controls.xml" name="panel_windlight_controls" height="20" left="0" width="182" />
+  <string name="sunrise">
+    Sunrise
+  </string>
+  <string name="sunset">
+    Midday
+  </string>
+  <string name="noon">
+    Noon
+  </string>
+  <string name="midnight">
+    Midnight
+  </string>
+  <string name="revert_region">
+    Revert to Region Default
+  </string>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
new file mode 100644
index 0000000..2fd9be5
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="0"
+     follows="right|bottom" height="47" left="0" mouse_opaque="true"
+     name="windlight_remote" use_bounding_rect="true" width="182">
+        <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="47" left="0" width="182" />
+        <slider bottom="-20" can_edit_text="false" control_name="RenderFarClip"
+             decimal_digits="0" enabled="true" height="18"
+             increment="8" initial_val="160" label="Draw Distance:"
+             label_width="78" left="6" max_val="512" min_val="64" mouse_opaque="true"
+             name="DrawDistance" show_text="true" width="170" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
+             left="170" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
+             width="8">
+    m
+  </text>
+        <panel bottom="13" filename="panel_windlight_controls.xml" left="0" width="182" />
+  <string name="sunrise">
+    Sunrise
+  </string>
+  <string name="sunset">
+    Midday
+  </string>
+  <string name="noon">
+    Noon
+  </string>
+  <string name="midnight">
+    Midnight
+  </string>
+  <string name="revert_region">
+    Revert to Region Default
+  </string>
+</panel>
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index a69f43f..abe61bf 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -69,6 +69,8 @@
 <TextEmbeddedItemColor value="0, 0, 128, 255" />            <!-- Text of items embedded in notecards -->
 <TextDefaultColor value="0, 20, 0, 255"/>                   <!-- Non-keyword text in the script editor -->
 <ScriptBgReadOnlyColor value="180, 180, 180, 255" />        <!-- Not used -->
+<TextLinkColor value="0, 20, 255, 255"/>
+<TextLinkHoverColor value="0, 50, 255, 255"/>
  
 <!-- LISTBOXES -->
 <ScrollBgReadOnlyColor value="255, 255, 255, 140" />    <!-- Background of read only lists -->
diff --git a/linden/indra/newview/skins/silver/textures/arrow_left.tga b/linden/indra/newview/skins/silver/textures/arrow_left.tga
new file mode 100644
index 0000000..43fbf12
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/arrow_left.tga
diff --git a/linden/indra/newview/skins/silver/textures/arrow_right.tga b/linden/indra/newview/skins/silver/textures/arrow_right.tga
new file mode 100644
index 0000000..a92ac9c
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/arrow_right.tga
diff --git a/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml
deleted file mode 100644
index 62738dc..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml
+++ /dev/null
@@ -1,430 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="-550" height="486" left="350" name="Panel Avatar" width="430">
-        <tab_container bottom="-486" height="486" left="0" mouse_opaque="false" name="tab"
-             tab_min_width="50" tab_position="top" width="419">
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-                     label="2nd Life" left="1" mouse_opaque="true" name="2nd Life" width="418">
-                        <string name="CaptionTextAcctInfo">
-                                [ACCTTYPE]
-[PAYMENTINFO]
-[AGEVERIFICATION]
-                        </string>
-                        <string name="AcctTypeResident">
-                                Resident
-                        </string>
-                        <string name="AcctTypeTrial">
-                                Trial
-                        </string>
-                        <string name="AcctTypeCharterMember">
-                                Charter Member
-                        </string>
-                        <string name="AcctTypeEmployee">
-                                Linden Lab Employee
-                        </string>
-                        <string name="PaymentInfoUsed">
-                                Payment Info Used
-                        </string>
-                        <string name="PaymentInfoOnFile">
-                                Payment Info On File
-                        </string>
-                        <string name="NoPaymentInfoOnFile">
-                                No Payment Info On File
-                        </string>
-                        <string name="AgeVerified">
-                                Age-verified
-                        </string>
-                        <string name="NotAgeVerified">
-                                Not Age-verified
-                        </string>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Name:" v_pad="0" width="70">
-                                Name:
-                        </text>
-                        <name_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom="-24" enabled="false" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"
-                             max_length="254" mouse_opaque="false" name="name"
-                             width="180" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifsmall" h_pad="0" halign="left" height="16" left="279"
-                             mouse_opaque="true" name="online_yes" v_pad="0" width="121">
-                                Currently Online
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
-                             mouse_opaque="true" name="label" v_pad="0" width="121">
-                                Born:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="279"
-                             max_length="254" mouse_opaque="false" name="born"
-                             width="121" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
-                             mouse_opaque="true" name="label2" v_pad="0" width="121">
-                                Account:
-                        </text>
-                        <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="48" left="279"
-                             mouse_opaque="false" name="acct_border" width="121" />
-                        <text bg_visible="false" border_drop_shadow_visible="false"
-                             border_visible="true" bottom_delta="0" drop_shadow_visible="true"
-                             follows="left|top" font="SansSerifSmall" height="48" left="279"
-                             mouse_opaque="false" name="acct" width="121" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
-                             mouse_opaque="true" name="partner_label"
-                             tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
-                             v_pad="0" width="130">
-                                Partner:
-                        </text>
-                        <button bottom_delta="2" follows="left|top" font="SansSerif" halign="center"
-                             height="16" label="i" label_selected="i" left_delta="44"
-                             mouse_opaque="true" name="partner_info"
-                             tool_tip="Click to open partner&apos;s profile" width="18" />
-                        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-                             height="16" label="?" label_selected="?" left_delta="24"
-                             mouse_opaque="true" name="partner_help" width="18" />
-                        <line_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="279"
-                             max_length="254" mouse_opaque="false" name="partner_edit"
-                             tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
-                             width="121">
-                                [FIRST] [LAST]
-                        </line_editor>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-44" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Photo:" v_pad="0" width="70">
-                                Photo:
-                        </text>
-                        <texture_picker allow_no_texture="true" bottom="-179" can_apply_immediately="false"
-                             default_image_name="None" follows="left|top" height="151" label=""
-                             left="79" mouse_opaque="true" name="img"
-                             tool_tip="Click to choose a picture" width="180" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-183" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Groups:" v_pad="0" width="70">
-                                Groups:
-                        </text>
-                        <scroll_list background_visible="true" bottom="-258" column_padding="5" draw_border="true"
-                             follows="left|top" height="90" left="79" mouse_opaque="false"
-                             multi_select="false" name="groups" width="321" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-280" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="About:" v_pad="0" width="70">
-                                About:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
-                             mouse_opaque="true" name="(500 chars)" v_pad="0" width="70">
-                                (500 chars)
-                        </text>
-                        <text_editor bottom="-375" embedded_items="false"
-                             enabled="true" follows="left|top" font="SansSerifSmall" height="110"
-                             is_unicode="false" left="79" max_length="511" mouse_opaque="true"
-                             name="about" width="321" word_wrap="true" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-403" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
-                             mouse_opaque="true" name="Give item:" v_pad="0" width="75">
-                                Give item:
-                        </text>
-                        <view_border blevel_style="in" border_thickness="0" bottom="-466" follows="left|top"
-                             height="466" left_delta="4" mouse_opaque="false" name="drop_target_rect"
-                             width="409" />
-                        <view_border blevel_style="in" bottom="-403" follows="left|top" height="16" left_delta="75"
-                             mouse_opaque="false" name="drop_target_rect_vis" width="321" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" left_delta="0"
-                             mouse_opaque="true" name="Give inventory"
-                             tool_tip="Drop inventory items here to give them to this person." v_pad="2"
-                             width="321">
-                                Drop inventory item here.
-                        </text>
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Show in search" left="75" mouse_opaque="true"
-                             name="allow_publish"
-                             tool_tip="Publish extra profile information such as description and image in Search."
-                             width="130" />
-                        <button bottom="-423" follows="left|top" font="SansSerif" halign="center" height="16"
-                             label="?" label_selected="?" left_delta="145" mouse_opaque="true" name="?"
-                             width="20" />
-                        <button bottom="-428" font="SansSerif" halign="center" height="20" label="Find on Map"
-                             label_selected="Find on Map" left="24" mouse_opaque="true"
-                             name="Find on Map" width="100" />
-                        <button bottom="-428" font="SansSerif" halign="center" height="20"
-                             label="Offer Teleport..." label_selected="Offer Teleport..."
-                             left_delta="102" mouse_opaque="true" name="Offer Teleport..." width="140" />
-                        <button bottom="-428" font="SansSerif" halign="center" height="20"
-                             label="Add Friend..." label_selected="Add Friend..." left_delta="142"
-                             mouse_opaque="true" name="Add Friend..." width="130" />
-                        <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Pay..."
-                             label_selected="Pay..." left="24" mouse_opaque="true" name="Pay..."
-                             width="100" />
-                        <button bottom_delta="0" font="SansSerif" halign="center" height="20"
-                             label="Instant Message..." label_selected="Instant Message..."
-                             left_delta="102" mouse_opaque="true" name="Instant Message..."
-                             tool_tip="Instant Message (IM)" width="140" />
-                        <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Mute"
-                             label_selected="Mute" left_delta="142" mouse_opaque="true" name="Mute"
-                             width="130" />
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-                     label="Web" left="1" mouse_opaque="true" name="WebProfile" width="418">
-                  <line_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom_delta="-18" enabled="false" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="10"
-                             max_length="254" mouse_opaque="true" name="url_edit"
-                             width="400" />
-                        <flyout_button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
-                             height="18" label="Load" label_selected="Load" left="10"
-                             mouse_opaque="true" name="load" enabled="false" 
-                             tool_tip="Load this profile page with embedded web browser." width="80" >
-                                <flyout_button_item value="open" name="open_item">In external browser</flyout_button_item>
-                                <flyout_button_item value="home" name="home_item">Home URL</flyout_button_item>
-                        </flyout_button>
-                        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-                             height="18" label="?" label_selected="?" left_delta="85"
-                             mouse_opaque="true" name="web_profile_help" width="18" />
-                        <check_box bottom_delta="0" follows="right|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Automatically load web profiles"
-                             left_delta="30" mouse_opaque="true" name="auto_load"
-                             tool_tip="Automatically load ALL profile webpages without asking first."
-                             width="127" />
-                        <web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400"
-                             ignore_ui_scale="false" left="10" name="profile_html" start_url=""
-                             width="400" />
-                        <text bottom="5" follows="bottom|left|right" left="15" name="status_text" right="-70"
-                             top="25" />
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-                     label="Interests" left="1" mouse_opaque="true" name="Interests" width="418">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-36" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="I Want To:" v_pad="0" width="70">
-                                I Want To:
-                        </text>
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Build" left_delta="70" mouse_opaque="true"
-                             name="chk0" width="90" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Explore" left_delta="170" mouse_opaque="true"
-                             name="chk1" width="90" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Meet" left_delta="-170" mouse_opaque="true"
-                             name="chk2" width="57" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Be Hired" left_delta="170" mouse_opaque="true"
-                             name="chk6" width="92" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Group" left_delta="-170" mouse_opaque="true"
-                             name="chk3" width="90" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Buy" left_delta="170" mouse_opaque="true"
-                             name="chk4" width="90" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Sell" left_delta="-170" mouse_opaque="true"
-                             name="chk5" width="50" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Hire" left_delta="170" mouse_opaque="true"
-                             name="chk7" width="92" />
-                        <line_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="74"
-                             max_length="254" mouse_opaque="true" name="want_to_edit"
-                             width="330" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Skills:" v_pad="0" width="70">
-                                Skills:
-                        </text>
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Textures" left_delta="70" mouse_opaque="true"
-                             name="schk0" width="90" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Architecture" left_delta="170"
-                             mouse_opaque="true" name="schk1" width="93" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Event Planning" left_delta="0"
-                             mouse_opaque="true" name="schk2" width="105" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Modeling" left_delta="-170"
-                             mouse_opaque="true" name="schk3" width="90" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Scripting" left_delta="0" mouse_opaque="true"
-                             name="schk4" width="90" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Custom Characters" left_delta="170"
-                             mouse_opaque="true" name="schk5" width="127" />
-                        <line_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="74"
-                             max_length="254" mouse_opaque="true" name="skills_edit"
-                             width="330" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Languages:" v_pad="0" width="70">
-                                Languages:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom_delta="0" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="74"
-                             max_length="254" mouse_opaque="true" name="languages_edit"
-                             width="330" />
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-                     label="Picks" left="1" mouse_opaque="true" name="Picks" width="418">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
-                             mouse_opaque="true"
-                             name="Tell everyone about your favorite places in Second Life." v_pad="0"
-                             width="302">
-                                Tell everyone about your favorite places in Second Life.
-                        </text>
-                        <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                             height="20" label="New..." label_selected="New..." left="114"
-                             mouse_opaque="true" name="New..." width="75" />
-                        <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
-                             label="Delete..." label_selected="Delete..." left_delta="79"
-                             mouse_opaque="true" name="Delete..." width="75" />
-                        <tab_container bottom="-411" follows="left|top" height="363" left="4" mouse_opaque="false"
-                             name="picks tab" tab_position="left" width="412" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                             h_pad="0" halign="left" height="20" left="114" mouse_opaque="false"
-                             name="loading_text" v_pad="0" width="302">
-                                Loading...
-                        </text>
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-                     label="Classified" left="1" mouse_opaque="true" name="Classified"
-                     width="418">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
-                             mouse_opaque="true"
-                             name="Place an ad in Second Life&apos;s classified listings." v_pad="0"
-                             width="302">
-                                Place an ad in Second Life&apos;s classified listings.
-                        </text>
-                        <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                             height="20" label="New..." label_selected="New..." left="114"
-                             mouse_opaque="true" name="New..." width="75" />
-                        <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
-                             label="Delete..." label_selected="Delete..." left_delta="79"
-                             mouse_opaque="true" name="Delete..." width="75" />
-                        <tab_container bottom="-443" follows="left|top" height="395" left="4" mouse_opaque="false"
-                             name="classified tab" tab_position="left" width="412" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                             h_pad="0" halign="left" height="20" left="114" mouse_opaque="false"
-                             name="loading_text" v_pad="0" width="302">
-                                Loading...
-                        </text>
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-                     label="1st Life" left="1" mouse_opaque="true" name="1st Life" width="418">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-36" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Photo:" v_pad="0" width="61">
-                                Photo:
-                        </text>
-                        <texture_picker allow_no_texture="true" bottom="-171" can_apply_immediately="false"
-                             default_image_name="None" follows="left|top" height="151" label=""
-                             left="70" mouse_opaque="true" name="img"
-                             tool_tip="Click to choose a picture" width="135" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-203" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Info:" v_pad="0" width="61">
-                                Info:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
-                             mouse_opaque="true" name="(250 chars)" v_pad="0" width="65">
-                                (250 chars)
-                        </text>
-                        <text_editor bottom="-347" embedded_items="false"
-                             enabled="true" follows="left|top" font="SansSerifSmall" height="160"
-                             is_unicode="false" left="70" max_length="254" mouse_opaque="false"
-                             name="about" width="330" word_wrap="true" />
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-                     label="My Notes" left="1" mouse_opaque="true" name="My Notes" width="418">
-                        <string name="Loading">
-                                Loading...
-                        </string>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-52" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="48" left="10"
-                             mouse_opaque="true" name="label" v_pad="0" width="412">
-                                Use this space to record your notes about this person.  Keep track
-of trades in progress, joint projects, etc.  Only you can see these
-notes.  This person cannot see them, nor can other people.
-                        </text>
-                        <text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top"
-                             font="SansSerif" height="256" is_unicode="false" left="10"
-                             max_length="1023" mouse_opaque="true" name="notes edit" width="400"
-                             word_wrap="false" />
-                </panel>
-        </tab_container>
-        <button bottom="-483" font="SansSerif" halign="center" height="20" label="OK"
-             label_selected="OK" left="208" mouse_opaque="true" name="OK" width="100" />
-        <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Cancel"
-             label_selected="Cancel" left_delta="105" mouse_opaque="true" name="Cancel"
-             width="100" />
-        <button bottom_delta="132" font="SansSerif" halign="center" height="20" label="Kick"
-             label_selected="Kick" left="4" mouse_opaque="true" name="Kick" width="72" />
-        <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Freeze"
-             label_selected="Freeze" left="4" mouse_opaque="true" name="Freeze"
-             tool_tip="Stop this resident&apos;s movement and chat." width="72" />
-        <button bottom_delta="-24" font="SansSerif" halign="center" height="20"
-             label="Unfreeze" label_selected="Unfreeze" left="4" mouse_opaque="true"
-             name="Unfreeze" tool_tip="Thaw resident" width="72" />
-        <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="CSR"
-             label_selected="CSR" left="4" mouse_opaque="true" name="csr_btn"
-             tool_tip="Open customer service tool for this resident" width="72" />
-        <string name="ShowOnMapNonFriend">
-                Show location on the map.
-Disabled because you have not
-formed a friendship with them.
-        </string>
-        <string name="ShowOnMapFriendOffline">
-                Show location on the map.
-    Disabled because they are not online.
-        </string>
-        <string name="ShowOnMapFriendOnline">
-                Show location on the map.
-        </string>
-        <string name="TeleportGod">
-                Force a teleport to your location.
-        </string>
-        <string name="TeleportPrelude">
-                Offer a teleport to your location.
-Disabled until you leave Orientation Island.
-        </string>
-        <string name="TeleportNormal">
-                Offer a teleport to your location.
-        </string>
-        <string name="Loading">
-                Loading...
-        </string>
-</panel>