Merge remote branch 'mccabe/next' into next

23 files changed, 374 insertions, 120 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index a1b6e53..597c595 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,96 @@
+2009-10-01 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Fixed switched Buy and Create locations in object pie menu (regression).
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+          
+          
+        * Fixed inability to teleport to adult regions in Imprudence 1.2.
+          (Ugly. Only use on 1.22 code base)
+          
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/llagent.cpp
+          modified:   linden/indra/newview/llagent.h
+          modified:   linden/indra/newview/llstartup.cpp
+          modified:   linden/indra/newview/llviewerregion.cpp
+
+
+        * Changed the minimum draw distance from 64m to 32m.
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
+
+
+        * Suspected partial crash fix for Logout.
+        
+          modified:   linden/indra/newview/llappviewer.cpp
+          
+          
+        * Fixed 1.2 thinking it was on the Teen Grid.
+          
+          modified:   linden/indra/newview/llstartup.cpp
+          
+          
+        * Updated gpu_table.txt to latest version in Snowglobe.
+        
+          modified:   linden/indra/newview/gpu_table.txt
+          
+
+2009-09-29 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Fixed Unlink not enabling when Edit Linked Parts enabled.
+        
+          modified:   linden/indra/newview/llfloatertools.cpp
+          modified:   linden/indra/newview/llviewermenu.cpp
+
+
+        * Fixed Join Call button truncated in group IMs (regression).
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+          
+          
+        * Fixed reset UI size to default button missing from preferences > general (regression).
+          Changed incremets to 0.001 to be more Liberation Sans-friendly.
+        
+          modified:   linden/indra/newview/llpanelgeneral.cpp
+          modified:   linden/indra/newview/llpanelgeneral.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+
+
+        * Renamed preferences checkbox to 'show WindLight toolbar,' removed reference to 'Second Life.'
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+
+
+        * Adjusted 2nd Life profile tab layout for French language.
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+          
+          
+        * Added the name box back to avatar profiles.
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+          
+
+2009-09-28 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Fixed first windlight toolbar entry toggling Advanced Sky.
+        
+          modified:   linden/indra/newview/llwindlightremotectrl.cpp
+          
+          
+        * Renamed ScriptBgReadOnlyColor to ScrollReadOnlyColor so we don't lose it in a merge.
+        
+          modified:   linden/indra/newview/llpanelavatar.cpp
+          modified:   linden/indra/newview/skins/default/colors_base.xml
+          modified:   linden/indra/newview/skins/silver/colors_base.xml
+
+
+        * Fixed Advanced Sky only toggling once.
+        
+          modified:   linden/indra/newview/llfloaterwindlight.cpp
+          
+
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 =-                       1.2.0 BETA                       -=
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index e9705de..7cc10af 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -5734,6 +5734,17 @@
       <key>Value</key>
       <real>6.0</real>
     </map>
+    <key>PreferredMaturity</key>
+    <map>
+      <key>Comment</key>
+      <string>Setting for the user's preferred maturity level.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>13</integer>
+    </map>
     <key>PreviewAnimRect</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/gpu_table.txt b/linden/indra/newview/gpu_table.txt
index 7484005..c08e2b5 100644
--- a/linden/indra/newview/gpu_table.txt
+++ b/linden/indra/newview/gpu_table.txt
@@ -90,14 +90,15 @@ ATI Radeon HD 2300				.*ATI.*Radeon HD 23.*				0		1
 ATI Radeon HD 2400                              .*ATI.*Radeon HD.*24.*                          1               1
 ATI Radeon HD 2600                              .*ATI.*Radeon HD 26.*                           2               1
 ATI Radeon HD 2900                              .*ATI.*Radeon HD 29.*                           3               1
-ATI Radeon HD 3200                              .*ATI.*Radeon HD.*32.*                          1               1
+ATI Radeon HD 3200                              .*ATI.*Radeon.*HD.*32.*                         1               1
 ATI Radeon HD 3300                              .*ATI.*Radeon HD.*33.*                          1               1
 ATI Radeon HD 3400                              .*ATI.*Radeon HD.*34.*                          1               1
 ATI Radeon HD 3600                              .*ATI.*Radeon HD.*36.*                          3               1
 ATI Radeon HD 3800                              .*ATI.*Radeon HD.*38.*                          3               1
 ATI Radeon HD 4300                              .*ATI.*Radeon HD 43.*                           1               1
+ATI Radeon HD 4500                              .*ATI.*Radeon HD 45.*                           2               1
 ATI Radeon HD 4600                              .*ATI.*Radeon HD 46.*                           3               1
-ATI Radeon HD 4800                              .*ATI.*Radeon HD.*48.*                          3               1
+ATI Radeon HD 4800                              .*ATI.*Radeon.*HD.*48.*                         3               1
 ATI Radeon OpenGL                               .*ATI.*Radeon OpenGL.*                          0               0
 ATI Radeon 2100                                 .*ATI.*Radeon 21.*                                      0               1
 ATI Radeon 3100                                 .*ATI.*Radeon 31.*                                      1               1
@@ -135,6 +136,7 @@ ATI Radeon X900					.*ATI.*Radeon X9.*					2		1
 ATI Radeon Xpress                               .*ATI.*Radeon Xpress.*                          0               0
 ATI Rage 128                                    .*ATI.*Rage 128.*                                       0               1
 ATI RV250                                               .*ATI.*RV250.*                                          0               1
+ATI RV380                                               .*ATI.*RV380.*                                          0               1
 ATI RV530                                               .*ATI.*RV530.*                                          1               1
 ATI RX700                                               .*ATI.*RX700.*                                          1               1
 Intel X3100                                             .*Intel.*X3100.*                                        0               1
@@ -160,8 +162,13 @@ Intel Montara					.*Intel.*Montara.*					0		0
 Intel Springdale                                .*Intel.*Springdale.*                           0               0
 Matrox                                                  .*Matrox.*                                                      0               0
 Mesa                                                    .*Mesa.*                                                        0               0
-NVIDIA GTX 260                                  .*NVIDIA.*GeForce.*GTX.*260.*           3               1
-NVIDIA GTX 280                                  .*NVIDIA.*GeForce.*GTX.*280.*           3               1
+NVIDIA GT 120                                   .*NVIDIA.*GeForce.*GT.*12.*                     2               1
+NVIDIA GT 130                                   .*NVIDIA.*GeForce.*GT.*13.*                     3               1
+NVIDIA GTS 250                                  .*NVIDIA.*GeForce.*GTS.*25.*            3               1
+NVIDIA GTX 260                                  .*NVIDIA.*GeForce.*GTX.*26.*            3               1
+NVIDIA GTX 270                                  .*NVIDIA.*GeForce.*GTX.*27.*            3               1
+NVIDIA GTX 280                                  .*NVIDIA.*GeForce.*GTX.*28.*            3               1
+NVIDIA GTX 290                                  .*NVIDIA.*GeForce.*GTX.*29.*            3               1
 NVIDIA C51                                              .*NVIDIA.*C51.*                                         0               1
 NVIDIA G72                                              .*NVIDIA.*G72.*                                         1               1
 NVIDIA G73                                              .*NVIDIA.*G73.*                                         1               1
@@ -187,7 +194,7 @@ NVIDIA GeForce 7300				.*NVIDIA.*GeForce 73.*				1		1
 NVIDIA GeForce 7500                             .*NVIDIA.*GeForce 75.*                          1               1
 NVIDIA GeForce 7600                             .*NVIDIA.*GeForce 76.*                          2               1
 NVIDIA GeForce 7800                             .*NVIDIA.*GeForce.*78.*                         2               1
-NVIDIA GeForce 7900                             .*NVIDIA.*GeForce 79.*                          2               1
+NVIDIA GeForce 7900                             .*NVIDIA.*GeForce.*79.*                         2               1
 NVIDIA GeForce 8100                             .*NVIDIA.*GeForce 81.*                          1               1
 NVIDIA GeForce 8200                             .*NVIDIA.*GeForce 82.*                          1               1
 NVIDIA GeForce 8300                             .*NVIDIA.*GeForce 83.*                          1               1
@@ -205,8 +212,8 @@ NVIDIA GeForce 9700M			.*NVIDIA.*GeForce 9700M.*			2		1
 NVIDIA GeForce 9300                             .*NVIDIA.*GeForce 93.*                          1               1
 NVIDIA GeForce 9400                             .*GeForce 94.*                                          1               1
 NVIDIA GeForce 9500                             .*NVIDIA.*GeForce 95.*                          2               1
-NVIDIA GeForce 9600                             .*NVIDIA.*GeForce 96.*                          3               1
-NVIDIA GeForce 9800                             .*NVIDIA.*GeForce 98.*                          3               1
+NVIDIA GeForce 9600                             .*NVIDIA.*GeForce.*96.*                         3               1
+NVIDIA GeForce 9800                             .*NVIDIA.*GeForce.*98.*                         3               1
 NVIDIA GeForce FX 5100                  .*NVIDIA.*GeForce FX 51.*                       0               1
 NVIDIA GeForce FX 5200                  .*NVIDIA.*GeForce FX 52.*                       0               1
 NVIDIA GeForce FX 5500                  .*NVIDIA.*GeForce FX 55.*                       0               1
@@ -236,8 +243,6 @@ NVIDIA GeForce Go 7600			.*NVIDIA.*GeForce Go 76.*			2		1
 NVIDIA GeForce Go 7700                  .*NVIDIA.*GeForce Go 77.*                       2               1
 NVIDIA GeForce Go 7800                  .*NVIDIA.*GeForce Go 78.*                       2               1
 NVIDIA GeForce Go 7900                  .*NVIDIA.*GeForce Go 79.*                       2               1
-NVIDIA GeForce GTX 260                  .*NVIDIA.*GeForce GTX 26.*                      3               1
-NVIDIA GeForce GTX 280                  .*NVIDIA.*GeForce GTX 28.*                      3               1
 NVIDIA D9M                                              .*D9M.*                                                         1               1
 NVIDIA G84                                              .*G84.*                                                         1               1
 NVIDIA G92                                              .*G92.*                                                         3               1
@@ -249,6 +254,7 @@ NVIDIA GeForce PCX				.*GeForce PCX.*						0		1
 NVIDIA Generic                                  .*NVIDIA.*Unknown.*                                     0               0
 NVIDIA NV17                                             .*GeForce NV17.*                                        0               1
 NVIDIA NV34                                             .*NVIDIA.*NV34.*                                        0               1
+NVIDIA NV35                                             .*NVIDIA.*NV35.*                                        0               1
 NVIDIA NV36                                             .*GeForce NV36.*                                        1               1
 NVIDIA NV43                                             .*NVIDIA.*NV43.*                                        1               1
 NVIDIA NV44                                             .*NVIDIA.*NV44.*                                        1               1
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index edcb82c..e6438f4 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -4894,6 +4894,32 @@ void LLAgent::setTeen(bool teen)
         }
 }
 
+//static 
+void LLAgent::convertTextToMaturity(char text) // HACK: remove when based on 1.23
+{
+        if ('A' == text)
+        {
+                mAccess = SIM_ACCESS_ADULT;
+                //return SIM_ACCESS_ADULT;
+        }
+        else if ('M'== text)
+        {
+                mAccess = SIM_ACCESS_MATURE;
+                //return SIM_ACCESS_MATURE;
+        }
+        else if ('P'== text)
+        {
+                mAccess = SIM_ACCESS_PG;
+                //return SIM_ACCESS_PG;
+        }
+        else
+        {
+                mAccess = SIM_ACCESS_MIN;
+                //return SIM_ACCESS_MIN;
+        }
+        gSavedSettings.setU32("PreferredMaturity", mAccess);
+}
+
 void LLAgent::buildFullname(std::string& name) const
 {
         if (mAvatarObject)
diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h
index d6854e4..bf0eeeb 100644
--- a/linden/indra/newview/llagent.h
+++ b/linden/indra/newview/llagent.h
@@ -255,6 +255,7 @@ public:
         U8                              getGodLevel() const;
         bool isTeen() const;
         void setTeen(bool teen);
+        void convertTextToMaturity(char text);// HACK: remove when based on 1.23
         BOOL                    isGroupTitleHidden() const              { return mHideGroupTitle; }
         BOOL                    isGroupMember() const           { return !mGroupID.isNull(); }          // This is only used for building titles!
         const LLUUID    &getGroupID() const                     { return mGroupID; }
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 52aa1eb..448e26b 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -3915,28 +3915,11 @@ void LLAppViewer::handleLoginComplete()
         gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
         gDebugInfo["ClientInfo"]["BuildVersion"] = LL_VERSION_BUILD;
-
-        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-        if ( parcel && parcel->getMusicURL()[0])
-        {
-                gDebugInfo["ParcelMusicURL"] = parcel->getMusicURL();
-        }       
-        if ( parcel && parcel->getMediaURL()[0])
-        {
-                gDebugInfo["ParcelMediaURL"] = parcel->getMediaURL();
-        }
-        
         gDebugInfo["SettingsFilename"] = gSavedSettings.getString("ClientSettingsFile");
         gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();
         gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName();
         gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath();
 
-        if(gAgent.getRegion())
-        {
-                gDebugInfo["CurrentSimHost"] = gAgent.getRegionHost().getHostName();
-                gDebugInfo["CurrentRegion"] = gAgent.getRegion()->getName();
-        }
-
         if(LLAppViewer::instance()->mMainloopTimeout)
         {
                 gDebugInfo["MainloopTimeoutState"] = LLAppViewer::instance()->mMainloopTimeout->getState();
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index d2a8040..4aca133 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -667,6 +667,7 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
         if (mBtnLink) mBtnLink->setVisible( edit_visible );
         if (mBtnUnlink) mBtnUnlink->setVisible( edit_visible );
 
+        //TODO: Move these into llselectmgr
         // Check to see if we can link things
         bool can_link = false;
         if (!gSavedSettings.getBOOL("EditLinkedParts"))
@@ -689,15 +690,44 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
 
         // Check to see if we can unlink things
         bool can_unlink = false;
-        if (LLSelectMgr::getInstance()->selectGetAllRootsValid() &&
-                LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() &&
-                !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment())
+        if (tool != LLToolFace::getInstance())
         {
-                if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() > 0 &&
-                        LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 
-                        LLSelectMgr::getInstance()->getSelection()->getObjectCount())
+                if (LLSelectMgr::getInstance()->selectGetAllRootsValid() &&
+                        LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() &&
+                        !LLSelectMgr::getInstance()->getSelection()->isAttachment())
                 {
-                        can_unlink = true;
+                        // LL's viewer unlinks the last linkset selected, 
+                        // regardless of how many linksets or prims are selected total. 
+                        // Preserve that behavior when enabling the unlink option.  
+                        if (gSavedSettings.getBOOL("EditLinkedParts"))
+                        {
+                                struct f : public LLSelectedNodeFunctor
+                                {
+                                        virtual bool apply(LLSelectNode* pNode)
+                                        {
+                                                // Return the first selection node that is
+                                                //    1) not a root prim
+                                                //    2) or a root prim that has child prims
+                                                // or in other words: any prim that is part of a linkset
+                                                return (pNode->getObject() != pNode->getObject()->getRootEdit()) || 
+                                                                (pNode->getObject()->numChildren() != 0);
+                                        }
+                                } func;
+
+                                if (LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(&func, TRUE))
+                                {
+                                        // the selection contains at least one prim (child or root) that is part of a linkset
+                                        can_unlink = true;
+                                }
+                        }
+                        else
+                        {
+                                if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 
+                                        LLSelectMgr::getInstance()->getSelection()->getObjectCount())
+                                {
+                                        can_unlink = true;
+                                }
+                        }
                 }
         }
         mBtnUnlink->setEnabled(can_unlink);
diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp
index 3cbcab1..71e81fa 100644
--- a/linden/indra/newview/llfloaterwindlight.cpp
+++ b/linden/indra/newview/llfloaterwindlight.cpp
@@ -476,12 +476,17 @@ void LLFloaterWindLight::show()
                 // comment in if you want the menu to rebuild each time
                 //LLUICtrlFactory::getInstance()->buildFloater(windLight, "floater_windlight_options.xml");
                 //windLight->initCallbacks();
-
-                windLight->open();
         }
         else
         {
-                sWindLight->close();
+                if (sWindLight->getVisible())
+                {
+                        sWindLight->close();
+                }
+                else
+                {
+                        sWindLight->open();
+                }
         }
 }
 
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 5fed44c..872c5e7 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1567,7 +1567,7 @@ void LLPanelAvatar::resetGroupList()
                                 else
                                 {
                                         row["columns"][0]["value"] = group_string + " " + getString("HiddenLabel");
-                                        row["columns"][0]["color"] = gColors.getColor("ScriptBgReadOnlyColor").getValue();
+                                        row["columns"][0]["color"] = gColors.getColor("ScrollReadOnlyColor").getValue();
                                 }
                                 group_list->addElement(row);
                         }
@@ -2086,7 +2086,7 @@ void LLPanelAvatar::processAvatarGroupsReply(LLMessageSystem *msg, void**)
                                 else
                                 {
                                         row["columns"][0]["value"] = group_string + " " + self->getString("HiddenLabel");
-                                        row["columns"][0]["color"] = gColors.getColor("ScriptBgReadOnlyColor").getValue();
+                                        row["columns"][0]["color"] = gColors.getColor("ScrollReadOnlyColor").getValue();
                                 }
                                 if (group_list)
                                 {
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 490e40d..e416401 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -74,6 +74,8 @@ BOOL LLPanelGeneral::postBuild()
         
         childSetValue("language_combobox",      gSavedSettings.getString("Language"));
 
+        childSetAction("reset_ui_size", onClickResetUISize, this);
+
         return TRUE;
 }
 
@@ -112,3 +114,10 @@ void LLPanelGeneral::apply()
 void LLPanelGeneral::cancel()
 {
 }
+
+// static
+void LLPanelGeneral::onClickResetUISize(void* user_data)
+{
+        LLPanelGeneral* self = (LLPanelGeneral*)user_data;
+        self->childSetValue("ui_scale_slider", 1.0f);
+}
diff --git a/linden/indra/newview/llpanelgeneral.h b/linden/indra/newview/llpanelgeneral.h
index 6fd10ff..73f6ee5 100644
--- a/linden/indra/newview/llpanelgeneral.h
+++ b/linden/indra/newview/llpanelgeneral.h
@@ -45,6 +45,9 @@ public:
 
         void apply();
         void cancel();
+        
+private:
+        static void onClickResetUISize(void*);
 };
 
 #endif
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 6839a4f..346f7dd 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1424,14 +1424,26 @@ bool idle_startup()
                         }
                         gSavedSettings.setBOOL("RememberPassword", remember_password);
 
-                        text = LLUserAuth::getInstance()->getResponse("agent_access");
-                        if(!text.empty() && (text[0] == 'M'))
+                        // This fixes Imprudence 1.2 thinking it's a teen. 
+                        // Will need fixing for the 1.23 merge.
+                        // this is their actual ability to access content
+                        text = LLUserAuth::getInstance()->getResponse("agent_access_max");
+                        if (!text.empty())
                         {
-                                gAgent.setTeen(false);
+                                // agent_access can be 'A', 'M', and 'PG'.
+                                gAgent.convertTextToMaturity(text[0]);
                         }
-                        else
+                        else // we're on an older sim version (prolly an opensim)
                         {
-                                gAgent.setTeen(true);
+                                text = LLUserAuth::getInstance()->getResponse("agent_access");
+                                if(!text.empty() && (text[0] == 'M'))
+                                {
+                                        gAgent.setTeen(false);
+                                }
+                                else
+                                {
+                                        gAgent.setTeen(true);
+                                }
                         }
 
                         text = LLUserAuth::getInstance()->getResponse("start_location");
@@ -2604,6 +2616,35 @@ bool idle_startup()
                 gDebugView->mFastTimerView->setVisible(TRUE);
 #endif
 
+                // HACK: remove this when based on 1.23
+                // Send our preferred maturity.
+                // Update agent access preference on the server
+                std::string url = gAgent.getRegion()->getCapability("UpdateAgentInformation");
+                if (!url.empty())
+                {
+                        U32 preferredMaturity = gSavedSettings.getU32("PreferredMaturity");
+                        // Set new access preference
+                        LLSD access_prefs = LLSD::emptyMap();
+                        if (preferredMaturity == SIM_ACCESS_PG)
+                        {
+                                access_prefs["max"] = "PG";
+                        }
+                        else if (preferredMaturity == SIM_ACCESS_MATURE)
+                        {
+                                access_prefs["max"] = "M";
+                        }
+                        if (preferredMaturity == SIM_ACCESS_ADULT)
+                        {
+                                access_prefs["max"] = "A";
+                        }
+                        
+                        LLSD body = LLSD::emptyMap();
+                        body["access_prefs"] = access_prefs;
+                        llinfos << "Sending access prefs update to " << (access_prefs["max"].asString()) << " via capability to: "
+                        << url << llendl;
+                        LLHTTPClient::post(url, body, new LLHTTPClient::Responder());    // Ignore response
+                }
+
                 LLAppViewer::instance()->initMainloopTimeout("Mainloop Init");
 
                 return TRUE;
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index ba24c16..f9ae401 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -169,6 +169,7 @@
 #include "lltool.h"
 #include "lltoolbar.h"
 #include "lltoolcomp.h"
+#include "lltoolface.h"
 #include "lltoolfocus.h"
 #include "lltoolgrab.h"
 #include "lltoolmgr.h"
@@ -4594,15 +4595,44 @@ class LLToolsEnableUnlink : public view_listener_t
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
                 bool new_value = false;
-                if (LLSelectMgr::getInstance()->selectGetAllRootsValid() &&
-                        LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() &&
-                        !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment())
+                if (LLToolMgr::getInstance()->getCurrentTool() != LLToolFace::getInstance())
                 {
-                        if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() > 0 &&
-                                LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 
-                                LLSelectMgr::getInstance()->getSelection()->getObjectCount())
+                        if (LLSelectMgr::getInstance()->selectGetAllRootsValid() &&
+                                LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() &&
+                                !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment())
                         {
-                                new_value = true;
+                                // LL's viewer unlinks the last linkset selected, 
+                                // regardless of how many linksets or prims are selected total. 
+                                // Preserve that behavior when enabling the unlink option.  
+                                if (gSavedSettings.getBOOL("EditLinkedParts"))
+                                {
+                                        struct f : public LLSelectedNodeFunctor
+                                        {
+                                                virtual bool apply(LLSelectNode* pNode)
+                                                {
+                                                        // Return the first selection node that is
+                                                        //    1) not a root prim
+                                                        //    2) or a root prim that has child prims
+                                                        // or in other words: any prim that is part of a linkset
+                                                        return (pNode->getObject() != pNode->getObject()->getRootEdit()) || 
+                                                                        (pNode->getObject()->numChildren() != 0);
+                                                }
+                                        } func;
+
+                                        if (LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(&func, TRUE))
+                                        {
+                                                // the selection contains at least one prim (child or root) that is part of a linkset
+                                                new_value = true;
+                                        }
+                                }
+                                else
+                                {
+                                        if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 
+                                                LLSelectMgr::getInstance()->getSelection()->getObjectCount())
+                                        {
+                                                new_value = true;
+                                        }
+                                }
                         }
                 }
 
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 1c527e0..0ba0879 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -542,6 +542,7 @@ std::string LLViewerRegion::regionFlagsToString(U32 flags)
 const char* SIM_ACCESS_STR[] = { "Free Trial",
                                                    "PG",
                                                    "Mature",
+                                                   "Adult",
                                                    "Offline",
                                                    "Unknown" };
                                                         
@@ -559,12 +560,15 @@ std::string LLViewerRegion::accessToString(U8 sim_access)
         case SIM_ACCESS_MATURE:
                 return SIM_ACCESS_STR[2];
 
-        case SIM_ACCESS_DOWN:
+        case SIM_ACCESS_ADULT:
                 return SIM_ACCESS_STR[3];
 
+        case SIM_ACCESS_DOWN:
+                return SIM_ACCESS_STR[4];
+
         case SIM_ACCESS_MIN:
         default:
-                return SIM_ACCESS_STR[4];
+                return SIM_ACCESS_STR[5];
         }
 }
 
@@ -584,6 +588,10 @@ U8 LLViewerRegion::stringToAccess(const std::string& access_str)
         {
                 sim_access = SIM_ACCESS_MATURE;
         }
+        else if (access_str == SIM_ACCESS_STR[3])
+        {
+                sim_access = SIM_ACCESS_ADULT;
+        }
         return sim_access;
 }
 
@@ -601,6 +609,9 @@ std::string LLViewerRegion::accessToShortString(U8 sim_access)
         case SIM_ACCESS_MATURE:
                 return "M";
 
+        case SIM_ACCESS_ADULT:
+                return "A";
+
         case SIM_ACCESS_MIN:
         default:
                 return "U";
@@ -1419,6 +1430,7 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
         capabilityNames.append("SendUserReportWithScreenshot");
         capabilityNames.append("ServerReleaseNotes");
         capabilityNames.append("StartGroupProposal");
+        capabilityNames.append("UpdateAgentInformation");
         capabilityNames.append("UpdateAgentLanguage");
         capabilityNames.append("UpdateGestureAgentInventory");
         capabilityNames.append("UpdateNotecardAgentInventory");
diff --git a/linden/indra/newview/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp
index 510e1df..ae9a90a 100644
--- a/linden/indra/newview/llwindlightremotectrl.cpp
+++ b/linden/indra/newview/llwindlightremotectrl.cpp
@@ -181,7 +181,7 @@ void LLWindlightRemoteCtrl::onCommitPreset(LLUICtrl* ctrl, void* data)
         if (presets)
         {
                 S32 index = presets->getFirstSelectedIndex();
-                if (index <= 0)
+                if (index < 0)
                 {
                         // Open Advanced Sky
                         LLFloaterWindLight::show();
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 9ad1787..8f0fc29 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -68,7 +68,6 @@
 <TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- Text of read-only items embedded in notecards -->
 <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"/>
   
@@ -83,6 +82,7 @@
 <ScrollHighlightedColor value="183, 184, 188, 128" />   <!-- Hover color -->
 <ScrollbarThumbColor value="60, 76, 124, 255" />        <!-- Scroll bar -->
 <ScrollbarTrackColor value="153, 154, 158, 255" />      <!-- Scroll bar background -->
+<ScrollReadOnlyColor value="100, 100, 100, 255" />      <!-- Color for inactive but not disabled lists -->
  
 <!-- MENUS -->
 <MenuBarBgColor value="62, 62, 62, 255" />                  <!-- Menu bar background -->
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index af60c11..1156e9d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -49,11 +49,11 @@
                         <button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"
                              image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
                              label="Join Call" left_delta="85" name="start_call_btn" pad_right="12"
-                             width="80" />
+                             width="92" />
                         <button bottom_delta="0" follows="left|top" halign="right" height="20"
                              image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
                              label="End Call" left_delta="0" name="end_call_btn" pad_right="12"
-                             visible="false" width="80" />
+                             visible="false" width="92" />
                         <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
                              label_selected="&gt; &gt;" left="143" name="toggle_active_speakers_btn"
                              right="176"
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
index 2c7ca3c..b1d16a2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
@@ -4,10 +4,10 @@
                 <on_click function="Object.Open" />
                 <on_enable function="Object.EnableOpen" />
         </menu_item_call>
-        <menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create">
-                <on_click function="Object.Build" />
-                <on_enable function="EnableEdit" />
-        </menu_item_call>
+  <menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">
+    <on_click function="Object.Buy" />
+    <on_enable function="Object.EnableBuy" />
+  </menu_item_call>
         <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Object Touch">
                 <on_click function="Object.Touch" />
                 <on_enable function="Object.EnableTouch" userdata="Touch" />
@@ -75,10 +75,10 @@
         <on_enable function="Tools.EnableUnlink" />
       </menu_item_call>
                 </pie_menu>
-                <menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">
-                        <on_click function="Object.Buy" />
-                        <on_enable function="Object.EnableBuy" />
-                </menu_item_call>
+    <menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create">
+      <on_click function="Object.Build" />
+      <on_enable function="EnableEdit" />
+    </menu_item_call>
         </pie_menu>
         <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit...">
                 <on_click function="Object.Edit" />
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 6bcd7a5..b811a66 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
@@ -38,67 +38,67 @@
       </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">
+                             font="SansSerifsmall" h_pad="0" halign="left" height="16" right="-12"
+                             mouse_opaque="true" name="online_yes" v_pad="0" width="145">
         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">
+                             mouse_opaque="true" name="online_no" v_pad="0" width="145">
         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" />
+                             right="-12" mouse_opaque="true" name="Instant Message..."
+                             tool_tip="Instant Message (IM)" width="145" />
       <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" />
+                             left_delta="0" mouse_opaque="true" name="Offer Teleport..." width="145" />
       <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" />
+                             mouse_opaque="true" name="Add Friend..." width="145" />
       <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" />
+                             mouse_opaque="true" name="Invite to Group..." width="145" />
       <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" />
+                             name="Find on Map" width="145" />
       <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" />
+                             width="145" />
       <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" />
+                             width="145" />
       <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">
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
+                             mouse_opaque="true" name="label" v_pad="0" width="145">
         Born:
       </text>
       <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="18" is_unicode="false" right="-15"
+                             font="SansSerifSmall" height="18" is_unicode="false" right="-12"
                              max_length="254" mouse_opaque="false" name="born"
-                             width="130" />
+                             width="145" />
       <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">
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
+                             mouse_opaque="true" name="label2" v_pad="0" width="345">
         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" />
+      <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="50" right="-12"
+                             mouse_opaque="false" name="acct_border" width="145" />
       <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"
+                             follows="left|top" font="SansSerifSmall" height="48" left="264"
                              mouse_opaque="false" name="acct" width="121" />
       <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"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
                              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">
+                             v_pad="0" width="145">
         Partner:
       </text>
       <button bottom_delta="1" follows="left|top" font="SansSerif" halign="center"
@@ -110,15 +110,20 @@
                              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"
+                             font="SansSerifSmall" height="18" is_unicode="false" right="-12"
                              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="130">
+                             width="145">
         [FIRST] [LAST]
       </line_editor>
-      <texture_picker allow_no_texture="true" bottom="289" can_apply_immediately="false"
+      <name_editor bevel_style="in" border_style="line"
+                             border_thickness="1" bottom="-23" enabled="false" follows="left|top"
+                             font="SansSerifSmall" height="16" is_unicode="false" left="12"
+                             max_length="254" mouse_opaque="false" name="name"
+                             width="235" />
+      <texture_picker allow_no_texture="true" bottom="271" 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"
+                             left="12" 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"
@@ -126,28 +131,28 @@
                              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"
+      <text_editor bottom_delta="-137" embedded_items="false"
+                             enabled="true" follows="left|top" font="SansSerifSmall" height="137"
                              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"
+                             font="SansSerifSmall" halign="left" height="16" left="12"
                              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" bottom_delta="0" follows="left|top" height="80" right="-12"
+                             mouse_opaque="false" name="drop_target_rect_vis" width="145" />
       <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" />
+                             width="145" />
       <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"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16" right="-28"
                              mouse_opaque="true" name="drop target"
                              tool_tip="Drop inventory items here to give them to this resident." v_pad="2"
                              width="115">
@@ -160,16 +165,11 @@
                              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" />
+                             width="145" />
       <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" />
@@ -206,7 +206,7 @@
                      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"
+                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
                              mouse_opaque="true" name="I Want To:" v_pad="0" width="70">
         I Want To:
       </text>
@@ -241,7 +241,7 @@
                              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"
+                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
                              mouse_opaque="true" name="Skills:" v_pad="0" width="70">
         Skills:
       </text>
@@ -270,7 +270,7 @@
                              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"
+                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
                              mouse_opaque="true" name="Languages:" v_pad="0" width="70">
         Languages:
       </text>
@@ -296,7 +296,7 @@
       <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="12" 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"
@@ -322,7 +322,7 @@
       <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="12" 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"
@@ -335,17 +335,17 @@
                      label="1st Life" left="1" mouse_opaque="true" name="1st Life" width="418">
       <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"
+                             left="12" 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"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
                              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"
+                             is_unicode="false" left="12" 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"
@@ -373,7 +373,7 @@
              label_selected="Cancel" left_delta="105" mouse_opaque="true" name="Cancel"
              width="100" />
   <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Kick"
-             label_selected="Kick" left="4" mouse_opaque="true" name="Kick" width="72" />
+             label_selected="Kick" left="12" mouse_opaque="true" name="Kick" width="72" />
   <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" />
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 e8a2625..bb1c5ee 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
@@ -62,9 +62,13 @@
                 UI Size:
         </text>
         <slider bottom="-217" can_edit_text="true"
-             decimal_digits="3" enabled="true" height="16" increment="0.025"
+             decimal_digits="3" enabled="true" height="16" increment="0.001"
              initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
-             name="ui_scale_slider" show_text="true" value="1" width="256" />
+             name="ui_scale_slider" show_text="true" value="1" width="220" />
+  <button bottom="-221" enabled="true" follows="left|top"
+             font="SansSerif" halign="center" height="22" label="Reset"
+             label_selected="Reset" left_delta="226" mouse_opaque="true"
+             name="reset_ui_size" scale_image="true" width="80" />
         <check_box bottom="-236" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Use resolution independent scale" left="151" mouse_opaque="true"
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 d5d43b1..c663ae2 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
@@ -6,11 +6,11 @@
              left="470" name="GraphicsPreferencesHelpButton" width="22" />
         <check_box bottom="-23" enabled="true" follows="left|top" font="SansSerifSmall"
              height="16" initial_value="false"
-             label="Run Second Life in a window" left="10" mouse_opaque="true"
+             label="Run Imprudence 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"
+       label="Show WindLight toolbar" left="275" 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"
@@ -251,7 +251,7 @@
         <slider bottom="-135" can_edit_text="false" control_name="RenderFarClip"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
              increment="8" initial_val="160" label="Draw Distance:"
-             label_width="140" left="215" max_val="512" min_val="64" mouse_opaque="true"
+             label_width="140" left="215" max_val="512" min_val="32" mouse_opaque="true"
              name="DrawDistance" show_text="true" width="255" />
         <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
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
index 2fd9be5..e7182fa 100644
--- 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
@@ -6,7 +6,7 @@
         <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"
+             label_width="78" left="6" max_val="512" min_val="32" 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"
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index abe61bf..6a94489 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -68,7 +68,6 @@
 <TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- Text of read-only items embedded in notecards -->
 <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"/>
  
@@ -83,7 +82,8 @@
 <ScrollHighlightedColor value="145, 180, 220, 128" />   <!-- Hover color -->
 <ScrollbarThumbColor value="120, 160, 200, 255" />      <!-- Scroll bar -->
 <ScrollbarTrackColor value="183, 202, 220, 255" />      <!-- Scroll bar background -->
- 
+<ScrollReadOnlyColor value="180, 180, 180, 255" />      <!-- Color for inactive but not disabled lists -->
+  
 <!-- MENUS -->
 <MenuBarBgColor value="185, 200, 220, 230" />               <!-- Menu bar background -->
 <MenuBarGodBgColor value="100, 200, 130, 230" />            <!-- Menu bar background with God Mode enabled -->