Merge 1.1.0 alpha into quickfilter

36 files changed, 712 insertions, 480 deletions

diff --git a/linden/indra/llcommon/llsecondlifeurls.cpp b/linden/indra/llcommon/llsecondlifeurls.cpp
index ee478fe..b006a6a 100644
--- a/linden/indra/llcommon/llsecondlifeurls.cpp
+++ b/linden/indra/llcommon/llsecondlifeurls.cpp
@@ -84,4 +84,4 @@ const std::string SL_KB_URL (
         "http://secondlife.com/knowledgebase/");
 
 const std::string RELEASE_NOTES_BASE_URL (
-        "http://secondlife.com/app/releasenotes/");
+        "http://imprudenceviewer.org/wiki/Release_Notes/");
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index bc42359..4032c5b 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -43,7 +43,8 @@ const char * const LL_VIEWER_NAME = "Second Life";
 const char * const IMP_VIEWER_NAME = "Imprudence";
 
 const S32 IMP_VERSION_MAJOR = 1;
-const S32 IMP_VERSION_MINOR = 0;
+const S32 IMP_VERSION_MINOR = 1;
 const S32 IMP_VERSION_PATCH = 0;
+const char * const IMP_VERSION_TEST = "alpha";
 
 #endif
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 1d2da46..ca3dd81 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -664,27 +664,38 @@
         <integer>0</integer>
       </array>
     </map>
-    <key>BeaconAlwaysOn</key>
+    <key>BeaconsEnabled</key>
     <map>
       <key>Comment</key>
       <string>Beacons / highlighting always on</string>
       <key>Persist</key>
-      <integer>1</integer>
+      <integer>0</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>BrowserHomePage</key>
+    <key>BrowserHome</key>
     <map>
       <key>Comment</key>
-      <string>[NOT USED]</string>
+      <string>Inworld browser home page</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://www.secondlife.com</string>
+      <string>http://www.imprudenceviewer.org</string>
+    </map>
+    <key>BrowserLastVisited</key>
+    <map>
+      <key>Comment</key>
+      <string>Last visited page</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string></string>
     </map>
     <key>BlockAvatarAppearanceMessages</key>
         <map>
@@ -6676,6 +6687,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>SelectCopyableOnly</key>
+    <map>
+      <key>Comment</key>
+      <string>Select only objects you can copy</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>SelectOwnedOnly</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 243a9d8..14214b5 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -602,11 +602,12 @@ bool LLAppViewer::init()
     writeSystemInfo();
 
         // Build a string representing the current version number.
-    gCurrentVersion = llformat("%s %d.%d.%d / %s %d.%d.%d.%d", 
+    gCurrentVersion = llformat("%s %d.%d.%d %s / %s %d.%d.%d.%d", 
         gSavedSettings.getString("VersionChannelName").c_str(), 
         IMP_VERSION_MAJOR, 
         IMP_VERSION_MINOR, 
-        IMP_VERSION_PATCH, 
+        IMP_VERSION_PATCH,
+                IMP_VERSION_TEST,
         LL_VIEWER_NAME,
         LL_VERSION_MAJOR, 
         LL_VERSION_MINOR, 
@@ -2247,6 +2248,7 @@ void LLAppViewer::writeSystemInfo()
         gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR;
         gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH;
+        gDebugInfo["ClientInfo"]["ImpTestVersion"] = IMP_VERSION_TEST;
         gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
         gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
@@ -2330,6 +2332,7 @@ void LLAppViewer::handleViewerCrash()
         gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR;
         gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH;
+        gDebugInfo["ClientInfo"]["ImpTestVersion"] = IMP_VERSION_TEST;
         gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
         gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
diff --git a/linden/indra/newview/llcolorscheme.cpp b/linden/indra/newview/llcolorscheme.cpp
index ef8b4a8..460f1a2 100644
--- a/linden/indra/newview/llcolorscheme.cpp
+++ b/linden/indra/newview/llcolorscheme.cpp
@@ -37,8 +37,6 @@
 
 LLColor4 gTrackColor;
 LLColor4 gSelfMapColor;
-LLColor4 gAvatarMapColor;
-LLColor4 gFriendMapColor;
 LLColor4 gLandmarkMapColor;
 LLColor4 gLocationMapColor;
 LLColor4 gTelehubMapColor;
@@ -56,8 +54,7 @@ void init_colors()
         gDisabledTrackColor.setVec(             0.5f, 0.f, 0.f, 1.f );
 
         gSelfMapColor     = LLColor4::white;
-        gAvatarMapColor   = LLColor4::green;
-        gFriendMapColor   = LLColor4::yellow;
+
         // fleshy color
         //gAvatarMapColor.setVec( 255.f/255.f, 223.f/255.f, 170.f/255.f, 1.f);
 
diff --git a/linden/indra/newview/llcolorscheme.h b/linden/indra/newview/llcolorscheme.h
index e772b11..bf1e053 100644
--- a/linden/indra/newview/llcolorscheme.h
+++ b/linden/indra/newview/llcolorscheme.h
@@ -36,8 +36,6 @@
 
 extern LLColor4 gTrackColor;
 extern LLColor4 gSelfMapColor;
-extern LLColor4 gAvatarMapColor;
-extern LLColor4 gFriendMapColor;
 extern LLColor4 gLandmarkMapColor;
 extern LLColor4 gLocationMapColor;
 extern LLColor4 gTelehubMapColor;
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 4704c5b..af436c5 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -110,9 +110,9 @@ LLFloaterAbout::LLFloaterAbout()
 
         // Version string
         std::string version = llformat(
-          "%s %d.%d.%d / %s %d.%d.%d (%d), %s %s\n",
+          "%s %d.%d.%d %s / %s %d.%d.%d (%d), %s %s\n",
                 IMP_VIEWER_NAME,
-          IMP_VERSION_MAJOR, IMP_VERSION_MINOR, IMP_VERSION_PATCH,
+          IMP_VERSION_MAJOR, IMP_VERSION_MINOR, IMP_VERSION_PATCH, IMP_VERSION_TEST,
                 LL_VIEWER_NAME,
           LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
           __DATE__, __TIME__);
@@ -262,17 +262,16 @@ void LLFloaterAbout::show(void*)
 static std::string get_viewer_release_notes_url()
 {
         std::ostringstream version;
-        version << LL_VERSION_MAJOR << "."
-                << LL_VERSION_MINOR << "."
-                << LL_VERSION_PATCH << "."
-                << LL_VERSION_BUILD;
+        version << IMP_VERSION_MAJOR << "."
+                << IMP_VERSION_MINOR << "."
+                << IMP_VERSION_PATCH;
 
-        LLSD query;
-        query["channel"] = gSavedSettings.getString("VersionChannelName");
-        query["version"] = version.str();
+        // Append the test version if it's not empty
+        if( strcmp(IMP_VERSION_TEST, "") != 0 )
+                version << "-" << IMP_VERSION_TEST;
 
         std::ostringstream url;
-        url << RELEASE_NOTES_BASE_URL << LLURI::mapToQueryString(query);
+        url << RELEASE_NOTES_BASE_URL << version.str();
 
         return url.str();
 }
diff --git a/linden/indra/newview/llfloatergroupinvite.cpp b/linden/indra/newview/llfloatergroupinvite.cpp
index 643abf7..1644050 100644
--- a/linden/indra/newview/llfloatergroupinvite.cpp
+++ b/linden/indra/newview/llfloatergroupinvite.cpp
@@ -34,7 +34,7 @@
 #include "llfloatergroupinvite.h"
 #include "llpanelgroupinvite.h"
 
-const char FLOATER_TITLE[] = "Group Invitation";
+const char FLOATER_TITLE[] = "Invite to ";
 const LLRect FGI_RECT(0, 380, 210, 0);
 
 class LLFloaterGroupInvite::impl
@@ -132,6 +132,11 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUU
                                                                            group_id);
 
                 impl::sInstances[group_id] = fgi;
+                
+                // Look up the group name.
+                // The callback will insert it into the title.
+                const BOOL is_group = TRUE;
+                gCacheName->get(group_id, is_group, callbackLoadGroupName, NULL);
 
                 fgi->mImpl->mInvitePanelp->clear();
         }
@@ -145,3 +150,16 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUU
         fgi->open();    /*Flawfinder: ignore*/
         fgi->mImpl->mInvitePanelp->update();
 }
+
+void LLFloaterGroupInvite::callbackLoadGroupName(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* data)
+{
+        LLFloaterGroupInvite *fgi = get_if_there(impl::sInstances, id, (LLFloaterGroupInvite*)NULL);
+
+        if (fgi)
+        {
+                // Build a new title including the group name.
+                std::ostringstream title;
+                title << FLOATER_TITLE << first;
+                fgi->setTitle(title.str());
+        }
+}
diff --git a/linden/indra/newview/llfloatergroupinvite.h b/linden/indra/newview/llfloatergroupinvite.h
index 621b5dd..96b9161 100644
--- a/linden/indra/newview/llfloatergroupinvite.h
+++ b/linden/indra/newview/llfloatergroupinvite.h
@@ -52,6 +52,12 @@ protected:
 
         class impl;
         impl* mImpl;
+private:
+        static void callbackLoadGroupName(const LLUUID& id, 
+                                const std::string& first, 
+                                const std::string& last, 
+                                BOOL is_group, 
+                                void* data);
 };
 
 #endif
diff --git a/linden/indra/newview/llfloaterhtmlhelp.cpp b/linden/indra/newview/llfloaterhtmlhelp.cpp
index d6d249e..7fe4d59 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.cpp
+++ b/linden/indra/newview/llfloaterhtmlhelp.cpp
@@ -58,7 +58,9 @@ LLFloaterMediaBrowser::LLFloaterMediaBrowser(const LLSD& media_data)
 
 void LLFloaterMediaBrowser::draw()
 {
-        childSetEnabled("go", !mAddressCombo->getValue().asString().empty());
+        BOOL url_exists = !mAddressCombo->getValue().asString().empty();
+        childSetEnabled("go", url_exists);
+        childSetEnabled("set_home", url_exists);
         LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
         if(parcel)
         {
@@ -84,6 +86,8 @@ BOOL LLFloaterMediaBrowser::postBuild()
         childSetAction("close", onClickClose, this);
         childSetAction("open_browser", onClickOpenWebBrowser, this);
         childSetAction("assign", onClickAssign, this);
+        childSetAction("home", onClickHome, this);
+        childSetAction("set_home", onClickSetHome, this);
 
         buildURLHistory();
         return TRUE;
@@ -146,6 +150,7 @@ void LLFloaterMediaBrowser::onLocationChange( const EventType& eventIn )
         childSetEnabled("back", mBrowser->canNavigateBack());
         childSetEnabled("forward", mBrowser->canNavigateForward());
         childSetEnabled("reload", TRUE);
+        gSavedSettings.setString("BrowserLastVisited", truncated_url);
 }
 
 LLFloaterMediaBrowser* LLFloaterMediaBrowser::showInstance(const LLSD& media_url)
@@ -156,6 +161,14 @@ LLFloaterMediaBrowser* LLFloaterMediaBrowser::showInstance(const LLSD& media_url
         return floaterp;
 }
 
+void LLFloaterMediaBrowser::show()
+{
+        //Show home url if new session, last visited if not
+        std::string last_url = gSavedSettings.getString("BrowserLastVisited");
+        if(last_url.empty()) 
+                last_url = gSavedSettings.getString("BrowserHome");
+        showInstance(last_url);
+}
 //static 
 void LLFloaterMediaBrowser::onEnterAddress(LLUICtrl* ctrl, void* user_data)
 {
@@ -238,6 +251,29 @@ void LLFloaterMediaBrowser::onClickAssign(void* user_data)
 
 }
 
+void LLFloaterMediaBrowser::onClickHome(void* user_data)
+{
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+        if (self)
+        {
+                if (self->mBrowser)
+                {
+                        std::string home_url = gSavedSettings.getString("BrowserHome");
+                        self->mBrowser->navigateTo(home_url);
+                }
+        }
+}
+
+void LLFloaterMediaBrowser::onClickSetHome(void* user_data)
+{
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+        std::string url = self->mCurrentURL;
+        if(!url.empty())
+        {
+                gSavedSettings.setString("BrowserHome", url);
+        }
+}
+
 void LLFloaterMediaBrowser::openMedia(const std::string& media_url)
 {
         mBrowser->setHomePageUrl(media_url);
diff --git a/linden/indra/newview/llfloaterhtmlhelp.h b/linden/indra/newview/llfloaterhtmlhelp.h
index 7257566..d726b77 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.h
+++ b/linden/indra/newview/llfloaterhtmlhelp.h
@@ -65,6 +65,7 @@ public:
         void buildURLHistory();
 
         static LLFloaterMediaBrowser* showInstance(const LLSD& id);
+        static void show();
         static void onEnterAddress(LLUICtrl* ctrl, void* user_data);
         static void onClickRefresh(void* user_data);
         static void onClickBack(void* user_data);
@@ -73,6 +74,8 @@ public:
         static void onClickClose(void* user_data);
         static void onClickOpenWebBrowser(void* user_data);
         static void onClickAssign(void* user_data);
+        static void onClickHome(void* user_data);
+        static void onClickSetHome(void* user_data);
 
 private:
         LLWebBrowserCtrl* mBrowser;
diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index d308210..8a665b5 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -206,8 +206,9 @@ void LLFloaterInspect::refresh()
         mObjectList->operateOnAll(LLScrollListCtrl::OP_DELETE);
         //List all transient objects, then all linked objects
 
-        for (LLObjectSelection::iterator iter = mObjectSelection->begin();
-                 iter != mObjectSelection->end(); iter++)
+        //Crash fix for VWR-10823
+        for (LLObjectSelection::valid_iterator iter = mObjectSelection->valid_begin(); 
+                                iter != mObjectSelection->valid_end(); iter++) 
         {
                 LLSelectNode* obj = *iter;
                 LLSD row;
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index b277998..22dee9d 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -69,7 +69,7 @@
 
 #include "llglheaders.h"
 
-const F32 MAP_SCALE_MIN = 64;
+const F32 MAP_SCALE_MIN = 32;
 const F32 MAP_SCALE_MID = 172;
 const F32 MAP_SCALE_MAX = 512;
 const F32 MAP_SCALE_INCREMENT = 16;
@@ -97,6 +97,9 @@ LLNetMap::LLNetMap(
         mPixelsPerMeter = gMiniMapScale / REGION_WIDTH_METERS;
 
         LLNetMap::sRotateMap = gSavedSettings.getBOOL( "MiniMapRotate" );
+
+        glyph_color_avatar = gColors.getColor("NetMapGlyphColorAvatar");
+        glyph_color_friend = gColors.getColor("NetMapGlyphColorFriend");
         
         // Surface texture is dynamically generated/updated.
 //      createObjectImage();
@@ -411,7 +414,7 @@ void LLNetMap::draw()
                                 }
                                 LLWorldMapView::drawAvatar(
                                         pos_map.mV[VX], pos_map.mV[VY], 
-                                        show_as_friend ? gFriendMapColor : gAvatarMapColor, 
+                                        show_as_friend ? glyph_color_friend : glyph_color_avatar, 
                                         pos_map.mV[VZ]);
                         }
                 }
diff --git a/linden/indra/newview/llnetmap.h b/linden/indra/newview/llnetmap.h
index 3fb20cc..91027c5 100644
--- a/linden/indra/newview/llnetmap.h
+++ b/linden/indra/newview/llnetmap.h
@@ -84,7 +84,10 @@ protected:
 
 public:
         LLHandle<LLView>        mPopupMenuHandle;
+
         LLColor4                mBackgroundColor;
+        LLColor4                glyph_color_avatar;
+        LLColor4                glyph_color_friend;
 
         F32                             mScale;                                 // Size of a region in pixels
         F32                             mPixelsPerMeter;                // world meters to map pixels
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 09e2cee..a495516 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -360,10 +360,11 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
         // childSetAction("quit_btn", onClickQuit, this);
 
         std::string imp_channel = gSavedSettings.getString("VersionChannelName");
-        std::string imp_version = llformat("%d.%d.%d",
+        std::string imp_version = llformat("%d.%d.%d %s",
                 IMP_VERSION_MAJOR,
                 IMP_VERSION_MINOR,
-                IMP_VERSION_PATCH );
+                IMP_VERSION_PATCH,
+                IMP_VERSION_TEST );
 
         std::string ll_channel = LL_VIEWER_NAME;
         std::string ll_version = llformat("%d.%d.%d (%d)",
@@ -711,6 +712,14 @@ void LLPanelLogin::addServer(const std::string& server, S32 domain_name)
         combo->setCurrentByIndex(0);
 }
 
+
+// static
+void LLPanelLogin::setServer(S32 domain_name)
+{
+        LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
+        combo->setCurrentByIndex(domain_name);
+}
+
 // static
 void LLPanelLogin::getFields(std::string &firstname, std::string &lastname, std::string &password,
                                                         BOOL &remember)
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index 539997b..78b0a22 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -87,6 +87,7 @@ public:
                 const std::string& password, BOOL remember);
 
         static void addServer(const std::string& server, S32 domain_name);
+        static void setServer(S32 domain_name);
         static void refreshLocation( bool force_visible );
 
         static void getFields(std::string& firstname, std::string& lastname,
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 2e4983c..7547dd2 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -5499,6 +5499,10 @@ void LLSelectMgr::updateSelectionCenter()
 
                 std::vector < LLViewerObject *> jointed_objects;
 
+                // Initialize the bounding box to the root prim, so the BBox orientation
+                // matches the root prim's (affecting the orientation of the manipulators).
+                bbox.addBBoxAgent( (mSelectedObjects->getFirstRootObject(TRUE))->getBoundingBoxAgent() );
+
                 for (LLObjectSelection::iterator iter = mSelectedObjects->begin();
                          iter != mSelectedObjects->end(); iter++)
                 {
@@ -5745,7 +5749,8 @@ BOOL LLSelectMgr::canSelectObject(LLViewerObject* object)
         }
 
         if ((gSavedSettings.getBOOL("SelectOwnedOnly") && !object->permYouOwner()) ||
-                (gSavedSettings.getBOOL("SelectMovableOnly") && !object->permMove()))
+                (gSavedSettings.getBOOL("SelectMovableOnly") && !object->permMove()) ||
+                (gSavedSettings.getBOOL("SelectCopyableOnly") && !object->permCopy()))
         {
                 // only select my own objects
                 return FALSE;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 625b1d8..6371f2b 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2458,14 +2458,14 @@ void login_show()
         // UI textures have been previously loaded in doPreloadImages()
         
         LL_DEBUGS("AppInit") << "Setting Servers" << LL_ENDL;
-
-        LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel(), LLViewerLogin::getInstance()->getGridChoice());
+        LL_INFOS("AppInit") << "getGridChoice is " << LLViewerLogin::getInstance()->getGridChoice() << LL_ENDL;
 
         LLViewerLogin* vl = LLViewerLogin::getInstance();
         for(int grid_index = GRID_INFO_NONE + 1; grid_index < GRID_INFO_OTHER; ++grid_index)
         {
                 LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index), grid_index);
         }
+        LLPanelLogin::setServer(LLViewerLogin::getInstance()->getGridChoice()-1);
 }
 
 // Callback for when login screen is closed.  Option 0 = connect, option 1 = quit.
diff --git a/linden/indra/newview/llurlhistory.cpp b/linden/indra/newview/llurlhistory.cpp
index ac3fa93..c10add4 100644
--- a/linden/indra/newview/llurlhistory.cpp
+++ b/linden/indra/newview/llurlhistory.cpp
@@ -72,9 +72,17 @@ bool LLURLHistory::loadFile(const std::string& filename)
 
 // static
 bool LLURLHistory::saveFile(const std::string& filename)
-{
-        std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
-        llofstream out((temp_str + filename));
+{       
+        std::string temp_str = gDirUtilp->getLindenUserDir();
+        if( temp_str.empty() )
+        {
+                llwarns << "Can't save " << filename 
+                        << ": No user directory set." << llendl;
+                return false;
+        }
+
+        temp_str += gDirUtilp->getDirDelimiter() + filename;
+        llofstream out(temp_str);
         if (!out.good())
         {
                 llwarns << "Unable to open " << filename << " for output." << llendl;
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 5e67712..3bf390e 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -5305,6 +5305,10 @@ class LLShowFloater : public view_listener_t
                 {
                         LLFloaterActiveSpeakers::toggleInstance(LLSD());
                 }
+                else if (floater_name == "inworld browser")
+                {
+                        LLFloaterMediaBrowser::show();
+                }
                 return true;
         }
 };
@@ -6714,6 +6718,18 @@ class LLToolsSelectOnlyMovableObjects : public view_listener_t
         }
 };
 
+class LLToolsSelectOnlyCopyableObjects : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                BOOL cur_val = gSavedSettings.getBOOL("SelectCopyableOnly");
+
+                gSavedSettings.setBOOL("SelectCopyableOnly", ! cur_val );
+
+                return true;
+        }
+};
+
 class LLToolsSelectBySurrounding : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -9829,6 +9845,7 @@ void initialize_menus()
         addMenu(new LLToolsSelectTool(), "Tools.SelectTool");
         addMenu(new LLToolsSelectOnlyMyObjects(), "Tools.SelectOnlyMyObjects");
         addMenu(new LLToolsSelectOnlyMovableObjects(), "Tools.SelectOnlyMovableObjects");
+        addMenu(new LLToolsSelectOnlyCopyableObjects(), "Tools.SelectOnlyCopyableObjects");
         addMenu(new LLToolsSelectBySurrounding(), "Tools.SelectBySurrounding");
         addMenu(new LLToolsShowHiddenSelection(), "Tools.ShowHiddenSelection");
         addMenu(new LLToolsShowSelectionLightRadius(), "Tools.ShowSelectionLightRadius");
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index c8cffcf..9019b88 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -110,34 +110,34 @@ void LLViewerLogin::setGridChoice(const std::string& grid_name)
         // The string can be:
         // - a grid label from the gGridInfo table 
         // - an ip address
-    if(!grid_name.empty())
-    {
-        // find the grid choice from the user setting.
-        int grid_index = GRID_INFO_NONE; 
-        for(;grid_index < GRID_INFO_OTHER; ++grid_index)
-        {
-            if(0 == LLStringUtil::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name))
-            {
+        if(!grid_name.empty())
+        {
+                // find the grid choice from the user setting.
+                int grid_index = GRID_INFO_NONE; 
+                for(;grid_index < GRID_INFO_OTHER; ++grid_index)
+                {
+                        if(0 == LLStringUtil::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name))
+                        {
                                 // Founding a matching label in the list...
                                 setGridChoice((EGridInfo)grid_index);
                                 break;
-            }
-        }
+                        }
+                }
 
-        if(GRID_INFO_OTHER == grid_index)
-        {
-            // *FIX:MEP Can and should we validate that this is an IP address?
-            mGridChoice = GRID_INFO_OTHER;
-            mGridName = grid_name;
+                if(GRID_INFO_OTHER == grid_index)
+                {
+                        // *FIX:MEP Can and should we validate that this is an IP address?
+                        mGridChoice = GRID_INFO_OTHER;
+                        mGridName = grid_name;
                         gSavedSettings.setS32("ServerChoice", mGridChoice);
                         gSavedSettings.setString("CustomServer", mGridName);
-        }
-    }
+                }
+        }
 }
 
 void LLViewerLogin::resetURIs()
 {
-    // Clear URIs when picking a new server
+        // Clear URIs when picking a new server
         gSavedSettings.setValue("CmdLineLoginURI", LLSD::emptyArray());
         gSavedSettings.setString("CmdLineHelperURI", "");
 }
@@ -163,7 +163,8 @@ std::string LLViewerLogin::getGridLabel() const
 
 std::string LLViewerLogin::getGridCodeName() const
 {
-        if( gGridInfo[mGridChoice].mCodeName == "" )
+        // Fall back to grid label if code name is empty.
+        if( strcmp(gGridInfo[mGridChoice].mCodeName, "") == 0 )
         {
                 return getGridLabel();
         }
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 08dc979..2944d9d 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -1022,6 +1022,8 @@ void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg)
         U8 z_pos = 0;
 
         U32 pos = 0x0;
+        
+        LLUUID agent_id = LLUUID::null;
 
         S16 agent_index;
         S16 target_index;
@@ -1034,6 +1036,7 @@ void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg)
                 msg->getU8Fast(_PREHASH_Location, _PREHASH_X, x_pos, i);
                 msg->getU8Fast(_PREHASH_Location, _PREHASH_Y, y_pos, i);
                 msg->getU8Fast(_PREHASH_Location, _PREHASH_Z, z_pos, i);
+                msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id, i);
 
                 //llinfos << "  object X: " << (S32)x_pos << " Y: " << (S32)y_pos
                 //              << " Z: " << (S32)(z_pos * 4)
@@ -1059,6 +1062,7 @@ void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg)
                         pos <<= 8;
                         pos |= z_pos;
                         mMapAvatars.put(pos);
+                        mMapAvatarIDs.put(agent_id);
                 }
         }
 }
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 64c042a..2e77316 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -470,7 +470,7 @@ public:
                         ypos += y_inc;
                 }
                 // only display these messages if we are actually rendering beacons at this moment
-                if (LLPipeline::getRenderBeacons(NULL) && gSavedSettings.getBOOL("BeaconAlwaysOn"))
+                if (LLPipeline::getRenderBeacons(NULL) && gSavedSettings.getBOOL("BeaconsEnabled"))
                 {
                         if (LLPipeline::getRenderParticleBeacons(NULL))
                         {
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index 66c4068..4dee103 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.cpp
@@ -365,9 +365,14 @@ LLVector3d	LLWorld::clipToVisibleRegions(const LLVector3d &start_pos, const LLVe
                 clip_factor = (region_coord.mV[VY] - region_width) / delta_pos_abs.mdV[VY];
         }
 
-        // clamp to < 256 to stay in sim
+        // clamp to within region dimensions
         LLVector3d final_region_pos = LLVector3d(region_coord) - (delta_pos * clip_factor);
-        final_region_pos.clamp(0.0, 255.999);
+        final_region_pos.mdV[VX] = llclamp(final_region_pos.mdV[VX], 0.0,
+                                                                           (F64)(region_width - F_ALMOST_ZERO));
+        final_region_pos.mdV[VY] = llclamp(final_region_pos.mdV[VY], 0.0,
+                                                                           (F64)(region_width - F_ALMOST_ZERO));
+        final_region_pos.mdV[VZ] = llclamp(final_region_pos.mdV[VZ], 0.0,
+                                                                           (F64)(LLWorld::getInstance()->getRegionMaxHeight()));
         return regionp->getPosGlobalFromRegion(LLVector3(final_region_pos));
 }
 
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 92d9588..0d266dd 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -208,6 +208,8 @@ LLWorldMapView::LLWorldMapView(const std::string& name, const LLRect& rect )
         mTextBoxNorthWest = new LLTextBox( std::string("NW"), minor_dir_rect );
         mTextBoxNorthWest->setColor( minor_color );
         addChild( mTextBoxNorthWest );
+
+        glyph_color_avatar = gColors.getColor("NetMapGlyphColorAvatar");
 }
 
 
@@ -886,8 +888,8 @@ void LLWorldMapView::drawAgents()
                                 S32 agent_count = info.mExtra;
                                 sim_agent_count += info.mExtra;
                                 // Here's how we'd choose the color if info.mID were available but it's not being sent:
-                                //LLColor4 color = (agent_count == 1 && is_agent_friend(info.mID)) ? gFriendMapColor : gAvatarMapColor;
-                                drawImageStack(info.mPosGlobal, sAvatarSmallImage, agent_count, 3.f, gAvatarMapColor);
+                                //LLColor4 color = (agent_count == 1 && is_agent_friend(info.mID)) ? glyph_color_friend : glyph_color_avatar;
+                                drawImageStack(info.mPosGlobal, sAvatarSmallImage, agent_count, 3.f, glyph_color_avatar);
                         }
                         LLWorldMap::getInstance()->mNumAgents[handle] = sim_agent_count; // override mNumAgents for this sim
                 }
@@ -902,7 +904,7 @@ void LLWorldMapView::drawAgents()
                                 region_center[VY] += REGION_WIDTH_METERS / 2;
                                 // Reduce the stack size as you zoom out - always display at lease one agent where there is one or more
                                 S32 agent_count = (S32)(((num_agents-1) * agents_scale + (num_agents-1) * 0.1f)+.1f) + 1;
-                                drawImageStack(region_center, sAvatarSmallImage, agent_count, 3.f, gAvatarMapColor);
+                                drawImageStack(region_center, sAvatarSmallImage, agent_count, 3.f, glyph_color_avatar);
                         }
                 }
         }
diff --git a/linden/indra/newview/llworldmapview.h b/linden/indra/newview/llworldmapview.h
index 915a196..53f0bdd 100644
--- a/linden/indra/newview/llworldmapview.h
+++ b/linden/indra/newview/llworldmapview.h
@@ -189,6 +189,8 @@ public:
         handle_list_t mVisibleRegions; // set every frame
 
         static std::map<std::string,std::string> sStringsMap;
+
+        LLColor4                glyph_color_avatar;
 };
 
 #endif
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index f232fdf..3523635 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -2101,7 +2101,7 @@ void LLPipeline::postSort(LLCamera& camera)
         }
 
         // only render if the flag is set. The flag is only set if we are in edit mode or the toggle is set in the menus
-        if (gSavedSettings.getBOOL("BeaconAlwaysOn"))
+        if (gSavedSettings.getBOOL("BeaconsEnabled"))
         {
                 if (sRenderScriptedTouchBeacons)
                 {
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 3b85efa..ff3d53e 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -1,146 +1,180 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings version = "101">
-    
+<!-- Additional comments by McCabe Maxsted -->
+ 
 <!-- WINDOWS -->
-<TitleBarFocusColor value="255, 255, 255, 30" />        <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
-<FloaterFocusBorderColor value="0, 0, 0, 80" />
-<FloaterUnfocusBorderColor value="0, 0, 0, 80" />
-<FocusBackgroundColor value="62, 62, 62, 255" />        <!-- Background color of focused floaters -->
-<DefaultBackgroundColor value="62, 62, 62, 140" />      <!-- Background color for unfocused floaters -->
-<ColorDropShadow value="0, 0, 0, 200" />                <!-- The drop shadow behind windows and menus -->
+<TitleBarFocusColor value="255, 255, 255, 30" />        <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
+<FloaterFocusBorderColor value="0, 0, 0, 80" />         <!-- Focused window border color -->
+<FloaterUnfocusBorderColor value="0, 0, 0, 80" />       <!-- Unfocused window border color -->
+<FocusBackgroundColor value="62, 62, 62, 255" />        <!-- Background color of focused windows -->
+<DefaultBackgroundColor value="62, 62, 62, 140" />      <!-- Background color for unfocused windows -->
+<ColorDropShadow value="0, 0, 0, 200" />                <!-- The drop shadow behind windows and menus -->
 <DefaultHighlightDark value="26, 26, 26, 255" />
-<DefaultHighlightLight value="115, 132, 155, 255" />
-<DefaultShadowDark value="26, 26, 26, 255" />
-<DefaultShadowLight value="0, 0, 0, 255" />
-
-<!-- LABELS -->
-<LabelDisabledColor value="147, 169, 213, 77" />
-<LabelSelectedColor value="255, 255, 255, 255" />
+<DefaultHighlightLight value="115, 132, 155, 255" />    <!-- Unfocused border, bottom portion -->
+<DefaultShadowDark value="26, 26, 26, 255" />           <!-- Unfocused border, top portion -->
+<DefaultShadowLight value="0, 0, 0, 255" />             <!-- Tab area border for IMs -->
+ 
+<!-- WINDOW LABELS -->
+<LabelDisabledColor value="147, 169, 213, 77" />            <!-- Color for unfocused window titles -->
+<LabelSelectedColor value="255, 255, 255, 255" />           <!-- Color for mouseovered clickable labels, e.g. version info on the login screen -->
 <LabelSelectedDisabledColor value="164, 190, 237, 128" />
-<LabelTextColor value="147, 169, 213, 255" />
-
+<LabelTextColor value="147, 169, 213, 255" />               <!-- Color for window labels and titles -->
+ 
 <!-- LOGIN -->
-<LoginProgressBarBgColor value="255, 255, 255, 255" />
-<LoginProgressBarFgColor value="255, 255, 255, 255" />
-<LoginProgressBoxBorderColor value="0, 30, 60, 0" />
-<LoginProgressBoxCenterColor value="0, 0, 0, 200" />
-<LoginProgressBoxShadowColor value="0, 0, 0, 200" />
-<LoginProgressBoxTextColor value="255, 255, 255, 255"/>
-
+<LoginProgressBarBgColor value="255, 255, 255, 255" />      <!-- Login progress bar background -->
+<LoginProgressBarFgColor value="255, 255, 255, 255" />      <!-- Login progress bar -->
+<LoginProgressBoxBorderColor value="0, 30, 60, 0" />        <!-- Login progress box border -->
+<LoginProgressBoxCenterColor value="0, 0, 0, 200" />        <!-- Login progress box background -->
+<LoginProgressBoxShadowColor value="0, 0, 0, 200" />        <!-- Login progress box shadow -->
+<LoginProgressBoxTextColor value="255, 255, 255, 255"/>     <!-- Login progress text -->
+ 
 <!-- BUTTONS -->
-<ButtonLabelColor value="220, 220, 220, 255" />         <!-- Text labels for buttons, like the "OK" text -->
-<ButtonLabelSelectedColor value="220, 220, 220, 255" />
-<ButtonLabelDisabledColor value="147, 169, 213, 200" />
-<ButtonLabelSelectedDisabledColor value="164, 190, 237, 200" />
-<ButtonSelectedBgColor value="62, 62, 62, 255" />
-<ButtonSelectedColor value="255, 255, 255, 255" />
-<ButtonUnselectedBgColor value="62, 62, 62, 255" />
-<ButtonUnselectedFgColor value="255, 255, 255, 255" />
-<ButtonBorderColor value="239, 156, 0, 255" />
-<ButtonFlashBgColor value="255, 190, 62, 127" />
-<ButtonColor value="255, 255, 255, 255" />              <!-- Blended with button art, usually left as opaque white -->
-<ButtonImageColor value="255, 255, 255, 255" />         <!-- Blended with button art, usually left as opaque white -->
-
-<!-- SLIDERS -->
-<SliderDisabledThumbColor value="0, 0, 0, 255" />
-<SliderThumbCenterColor value="200, 200, 200, 255" />
-<SliderThumbOutlineColor value="255, 255, 255, 255" />
-<SliderTrackColor value="255, 255, 255, 255" />
-
+<ButtonLabelColor value="220, 220, 220, 255" />                 <!-- Label text color for buttons, like the "OK" text -->
+<ButtonLabelSelectedColor value="220, 220, 220, 255" />         <!-- Label text color when button selected -->
+<ButtonLabelDisabledColor value="147, 169, 213, 200" />         <!-- Label text color when button disabled -->
+<ButtonLabelSelectedDisabledColor value="164, 190, 237, 200" /> <!-- Label text color when button disabled but selected -->
+<ButtonSelectedBgColor value="62, 62, 62, 255" />           <!-- Not used -->
+<ButtonSelectedColor value="255, 255, 255, 255" />          <!-- Not used -->
+<ButtonUnselectedBgColor value="62, 62, 62, 255" />         <!-- Not used -->
+<ButtonUnselectedFgColor value="255, 255, 255, 255" />      <!-- Not used -->
+<ButtonBorderColor value="239, 156, 0, 255" />              <!-- Not used -->
+<ButtonFlashBgColor value="255, 190, 62, 127" />            <!-- Color of tab flashing on incoming IM -->
+<ButtonColor value="255, 255, 255, 255" />                  <!-- Blended with button art, usually left as opaque white -->
+<ButtonImageColor value="255, 255, 255, 255" />             <!-- Button color override (also checkboxes and scroll arrows).
+                                                                 Blended with button art, usually left as opaque white -->
+ 
+<!-- SLIDERS, single line -->
+<SliderDisabledThumbColor value="0, 0, 0, 255" />           <!-- Not used -->
+<SliderThumbCenterColor value="200, 200, 200, 255" />       <!-- Unfocused slider thumb color -->
+<SliderThumbOutlineColor value="255, 255, 255, 255" />      <!-- Focused slider thumb color -->
+<SliderTrackColor value="255, 255, 255, 255" />             <!-- Not used -->
+ 
+<!-- SLIDERS, multi line (as in the sky editor) -->
+<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>           <!-- Not used -->       
+<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>       <!-- Not used -->   
+<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>            <!-- Not used -->
+<MultiSliderTrackColor value="30, 30, 30, 255"/>                <!-- Not used -->
+<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/> <!-- Not used -->
+<MultiSliderTriangleColor value="255, 255, 50, 255"/>           <!-- Not used -->
+ 
 <!-- TEXTFIELDS -->
-<TextBgFocusColor value="200, 209, 204, 255" />         <!-- Text field background when receiving input (focused) -->
-<TextBgReadOnlyColor value="62, 62, 62, 160" />         <!-- Text field background when read-only -->
-<TextBgWriteableColor value="200, 209, 204, 230" />     <!-- Text field background when not receiving input (unfocused) -->
-<TextCursorColor value="0, 0, 0, 255" />
-<TextFgColor value="0, 0, 0, 255" />
-<TextFgReadOnlyColor value="255, 255, 255, 200" />
-<TextFgTentativeColor value="0, 0, 0, 128" />
-<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" />     <!-- i.e. About Land name that you don't own -->
-<TextEmbeddedItemColor value="0, 0, 128, 255" />
-<TextDefaultColor value="0, 20, 0, 255"/>
-  
+<TextBgFocusColor value="200, 209, 204, 255" />             <!-- Text field background when receiving input (focused) -->
+<TextBgReadOnlyColor value="62, 62, 62, 160" />             <!-- Text field background when read-only -->
+<TextBgWriteableColor value="200, 209, 204, 230" />         <!-- Text field background when not receiving input (unfocused) -->
+<TextCursorColor value="0, 0, 0, 255" />                    <!-- Cursor color in notecards and scripts only -->
+<TextFgColor value="0, 0, 0, 255" />                         <!-- Text color for all text entry fields; cursor color for line editors -->
+<TextFgReadOnlyColor value="255, 255, 255, 200" />          <!-- Text color in read-only fields -->
+<TextFgTentativeColor value="0, 0, 0, 128" />               <!-- Initial entry in text entry fields, e.g. "Click here to chat." -->
+<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 -->
+ 
 <!-- LISTBOXES -->
-<ScrollBgReadOnlyColor value="200, 209, 204, 255" />
-<ScrollBgWriteableColor value="200, 209, 204, 255" />
-<ScrollBGStripeColor value="100, 100, 100, 40" />
-<ScrollDisabledColor value="128, 128, 128, 204" />
-<ScrollSelectedBGColor value="100, 100, 188, 150" />
-<ScrollSelectedFGColor value="0, 0, 0, 204" />              <!-- Text color -->
-<ScrollUnselectedColor value="0, 0, 0, 204" />              <!-- Text color -->
-<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-->
-
+<ScrollBgReadOnlyColor value="200, 209, 204, 255" />    <!-- Background of read only lists -->
+<ScrollBgWriteableColor value="200, 209, 204, 255" />   <!-- Background of editable lists, e.g. groups-->
+<ScrollBGStripeColor value="100, 100, 100, 40" />       <!-- Background stripes in sortable lists, e.g. Events Search -->
+<ScrollDisabledColor value="128, 128, 128, 204" />      
+<ScrollSelectedBGColor value="100, 100, 188, 150" />    <!-- Selected item in a list highlight -->
+<ScrollSelectedFGColor value="0, 0, 0, 204" />          <!-- Text color -->
+<ScrollUnselectedColor value="0, 0, 0, 204" />          <!-- Text color -->
+<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 -->
+ 
 <!-- MENUS -->
-<MenuBarBgColor value="62, 62, 62, 255" />
-<MenuBarGodBgColor value="62, 128, 62, 255" />
-<MenuNonProductionGodBgColor value="0, 128, 0, 255" />
-<MenuNonProductionBgColor value="128, 0, 0, 255" />
-<MenuDefaultBgColor value="0, 0, 0, 255" />
+<MenuBarBgColor value="62, 62, 62, 255" />                  <!-- Menu bar background -->
+<MenuBarGodBgColor value="62, 128, 62, 255" />              <!-- Menu bar background with God Mode enabled -->
+<MenuNonProductionGodBgColor value="0, 128, 0, 255" />      <!-- Beta viewer menu bar background -->
+<MenuNonProductionBgColor value="128, 0, 0, 255" />         <!-- Beta viewer menu bar background with God Mode enabled -->
+<MenuDefaultBgColor value="0, 0, 0, 255" />                 <!-- Menu background -->
 <MenuItemDisabledColor value="133, 133, 164, 128" />        <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
 <MenuItemEnabledColor value="255, 255, 255, 255" />         <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
-<MenuItemHighlightBgColor value="183, 184, 188, 100" />
-<MenuItemHighlightFgColor value="255, 255, 255, 255" />     <!-- Highlighted menu text color; also treeview node selection highlight -->
-<MenuPopupBgColor value="0, 0, 0, 255" />
-
+<MenuItemHighlightBgColor value="183, 184, 188, 100" />     <!-- Highlighted menu item background color -->
+<MenuItemHighlightFgColor value="255, 255, 255, 255" />     <!-- Highlighted menu item text color; also treeview node selection highlight -->
+<MenuPopupBgColor value="0, 0, 0, 255" />                   <!-- Right-click menu background -->
+ 
 <!--  PIE MENUS -->
-<PieMenuBgColor value="62, 62, 62, 150" />
-<PieMenuLineColor value="0, 0, 0, 128" />
-<PieMenuSelectedColor value="183, 184, 188, 77" />
-
+<PieMenuBgColor value="62, 62, 62, 150" />              <!-- Color of pie menu -->
+<PieMenuLineColor value="0, 0, 0, 128" />               <!-- Color of pie menu slice separators -->
+<PieMenuSelectedColor value="183, 184, 188, 77" />      <!-- Color of pie menu slice when selected -->
+ 
+<!-- MENU BAR -->
+<ParcelTextColor value="144, 165, 208, 255" />          <!-- Parcel name on menu bar, normal state -->
+<ParcelHoverColor value="255, 255, 255, 255" />         <!-- Parcel name on menu bar, hover state -->
+<TimeTextColor value="255, 255, 255, 255" />            <!-- SL Time on menu bar -->
+<BalanceTextColor value="0, 255, 0, 255" />             <!-- Linden dollar balance on menu bar -->
+<HealthTextColor value="255, 255, 255, 255" />          <!-- Damage meter text on menu bar -->
+ 
 <!-- TOOLTIPS -->
-<ToolTipBgColor value="183, 184, 188, 200" />
-<ToolTipBorderColor value="171, 212, 245, 255" />
-<ToolTipTextColor value="0, 0, 0, 255" />
-
+<ToolTipBgColor value="183, 184, 188, 200" />           <!-- Tool tips, i.e. "Hover Tips" -->
+<ToolTipBorderColor value="171, 212, 245, 255" />       <!-- Not used -->
+<ToolTipTextColor value="0, 0, 0, 255" />               <!-- Tool tips text color -->
+ 
 <!-- NOTIFICATION POP-UPS -->
-<NotifyBoxColor value="70, 170, 255, 255" />
-<NotifyTextColor value="0, 0, 0, 255" />
-<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- the background color of caution permissions prompts -->
-<NotifyCautionWarnColor value="0, 0, 0, 255" />         <!-- the foreground color of the special title text in caution permissions prompts -->
-<GroupNotifyBoxColor value="70, 170, 255, 255" />
-<GroupNotifyTextColor value="0, 30, 60, 255" />
-
+<NotifyBoxColor value="70, 170, 255, 255" />            <!-- Notification background, i.e. tp requests -->
+<NotifyTextColor value="0, 0, 0, 255" />                <!-- Notification text -->
+<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- Background color of caution permissions prompts -->
+<NotifyCautionWarnColor value="0, 0, 0, 255" />         <!-- Foreground color of the special title text in caution permissions prompts -->
+<GroupNotifyBoxColor value="70, 170, 255, 255" />       <!-- Group notices background -->
+<GroupNotifyTextColor value="0, 30, 60, 255" />         <!-- Group notices text -->
+ 
+<!-- ALERT BOX COLORS -->
+<AlertBoxColor value="62, 62, 62, 255" />               <!-- Alert floaters, like the warning before returning objects -->
+<AlertTextColor value="147, 169, 213, 255" />           <!-- Alert floater text -->
+<AlertCautionBoxColor value="254, 209, 118, 255" />     <!-- Background color of caution alerts -->
+<AlertCautionTextColor value="0, 0, 0, 255" />          <!-- Foreground color of the special title text in caution alerts -->
+ 
 <!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
-<ChatHistoryBgColor value="0, 0, 0, 0" />
-<ChatHistoryTextColor value="255, 255, 255, 255" />
-<IMHistoryBgColor value="0, 30, 80, 200" />
-<IMHistoryTextColor value="255, 255, 255, 255" />
-
+<ChatHistoryBgColor value="0, 0, 0, 0" />               <!-- Local Chat background -->
+<ChatHistoryTextColor value="255, 255, 255, 255" />     <!-- Local Chat text -->
+<IMHistoryBgColor value="0, 30, 80, 200" />             <!-- Instant Message background -->
+<IMHistoryTextColor value="255, 255, 255, 255" />       <!-- Instant Message text -->
+ 
 <!-- IN-WORLD SELECTION -->
-<SilhouetteParentColor value="255, 255, 0, 255" />
-<SilhouetteChildColor value="32, 106, 196, 255" />
+<SilhouetteParentColor value="255, 255, 0, 255" />      <!-- Root prim selection outline -->
+<SilhouetteChildColor value="32, 106, 196, 255" />      <!-- Child prim selection outline -->
 <HighlightParentColor value="171, 212, 245, 255" />
 <HighlightChildColor value="171, 212, 245, 255" />
-<HighlightInspectColor value="255, 0, 255, 255" />
-
+<HighlightInspectColor value="255, 0, 255, 255" />      <!-- Selection outline when inspecting -->
+ 
 <!-- EDIT MODE GRID -->
-<GridFocusPointColor value="255, 255, 255, 128" />
-<GridlineColor value="255, 255, 255, 255" />
-<GridlineBGColor value="235, 235, 255, 200" />
-<GridlineShadowColor value="0, 0, 0, 80" />
-
+<GridFocusPointColor value="255, 255, 255, 128" />      <!-- Not used -->
+<GridlineColor value="255, 255, 255, 255" />            <!-- Grid color -->
+<GridlineBGColor value="235, 235, 255, 200" />          <!-- Grid background color -->
+<GridlineShadowColor value="0, 0, 0, 80" />             <!-- Grid drop shadow -->
+ 
 <!-- PROPERTY LINES -->
-<PropertyColorAvail value="0, 0, 0, 0" />
-<PropertyColorGroup value="0, 184, 184, 102" />
-<PropertyColorOther value="255, 0, 0, 102" />
-<PropertyColorSelf value="0, 255, 0, 102" />
-<PropertyColorForSale value="255, 128, 0, 102" />
-<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->
-
-<!-- Icon Enable/Disable -->
-<IconEnabledColor value="255, 255, 255, 255"/>
-<IconDisabledColor value="147, 169, 213, 200"/>
-
+<PropertyColorAvail value="0, 0, 0, 0" />               
+<PropertyColorGroup value="0, 184, 184, 102" />         <!-- Property group owns -->
+<PropertyColorOther value="255, 0, 0, 102" />           <!-- Property others own -->
+<PropertyColorSelf value="0, 255, 0, 102" />            <!-- Property you own -->
+<PropertyColorForSale value="255, 128, 0, 102" />       <!-- Property for sale -->
+<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->
+ 
+<!-- MEDIA ICONS -->
+<IconEnabledColor value="255, 255, 255, 255"/>          <!-- Media/music icon enabled -->
+<IconDisabledColor value="147, 169, 213, 200"/>         <!-- Media/music icon disabled -->
+ 
 <!-- MINI-MAP -->
-<NetMapBackgroundColor value="0, 0, 0, 77" />
-<NetMapYouOwnAboveWater value="0, 255, 255, 255" />
-<NetMapYouOwnBelowWater value="0, 200, 200, 255" />
-<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />
-<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />
-<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />
-<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />
-
+<NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
+<NetMapYouOwnAboveWater value="0, 255, 255, 255" />     <!-- Objects owned by you above water -->
+<NetMapYouOwnBelowWater value="0, 200, 200, 255" />     <!-- Objects owned by you below water -->
+<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />   <!-- Group owned objects above water -->
+<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />   <!-- Group owned objects below water -->
+<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />    <!-- Objects owned by others above water -->
+<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />    <!-- Objects owned by others below water -->
+<NetMapGlyphColorAvatar value="0, 255, 0, 255" />       <!-- Also the color of avatar glyphs on the map -->
+<NetMapGlyphColorFriend value="255, 255, 0, 255" />
+ 
+<!-- INVENTORY -->
+<InventoryBackgroundColor value="62, 62, 62, 80"/>              <!-- Inventory floater background -->
+<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>  <!-- "loading..." -->
+<InventoryItemSuffixColor value="191, 216, 216, 255"/>          <!-- "worn", "no modify", etc -->
+<FilterBackgroundColor value="0, 0, 20, 255" />                 <!-- Inventory search background -->
+<FilterTextColor value="255, 200, 70, 255" />                   <!-- Inventory search text -->
+<InventorySearchStatusColor value="255, 255, 255, 255" />       <!-- "Searching..." -->
+ 
 <!-- HELP WINDOW -->
 <HelpBgColor value="200, 209, 204, 255" />
 <HelpFgColor value="0, 0, 0, 255" />
@@ -150,40 +184,13 @@
 <HelpScrollShadowColor value="0, 0, 0, 255" />
 
 <!-- MISC -->
-<AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->
-<FocusColor value="239, 156, 0, 255" />                 <!-- Color of the glow around UI controls with keyboard focus -->
-<FloaterButtonImageColor value="239, 156, 0, 255" />    <!-- The floater buttons (like the close box) are white images that receive this color. -->
-<ButtonCautionImageColor value="255, 255,  255, 255" /> <!-- Match the caution dialog buttons to the default -->
-<HealthTextColor value="255, 255, 255, 255" />
+<AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->
+<FocusColor value="239, 156, 0, 255" />                 <!-- Color of the glow around UI controls with keyboard focus -->
+<FloaterButtonImageColor value="239, 156, 0, 255" />    <!-- The floater buttons (like the close box) are white images that receive this color. -->
+<ButtonCautionImageColor value="255, 255, 255, 255" />  <!-- Match the caution dialog buttons to the default -->
 <MapAutopilotColor value="255, 128, 0, 255" />
-<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
-<ScriptBgReadOnlyColor value="100, 100, 100, 255" />
-<ParcelTextColor value="144, 165, 208, 255" />          <!-- Parcel name on menu bar, normal state -->
-<ParcelHoverColor value="255, 255, 255, 255" />         <!-- Parcel name on menu bar, hover state -->
-<TimeTextColor value="255, 255, 255, 255" />            <!-- SL Time on menu bar -->
-<BalanceTextColor value="0, 255, 0, 255" />             <!-- Linden dollar balance on menu bar -->
-<HealthTextColor value="255, 255, 255, 255" />          <!-- Damage meter text on menu bar -->
-<GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
-<FilterBackgroundColor value="0, 0, 20, 255" />         <!-- Matching region of Inventory search text -->
-<FilterTextColor value="255, 200, 70, 255" />
-<InventoryItemSuffixColor value="191, 216, 216, 255" />     <!-- "worn", "no modify", etc-->
-<InventorySearchStatusColor value="255, 255, 255, 255" />
-<ConsoleBackground value="0, 0, 0, 255" />
-<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>     <!-- "loading..." in the inv -->
-<InventoryBackgroundColor value="62, 62, 62, 80"/>
-
-<!-- Alert box colors -->
-<AlertBoxColor value="62, 62, 62, 255" />               <!-- Warnings floaters, like when returning objects -->
-<AlertTextColor value="147, 169, 213, 255" />
-<AlertCautionBoxColor value="254, 209, 118, 255" />     <!-- Background color of caution alerts -->
-<AlertCautionTextColor value="0, 0, 0, 255" />          <!-- Foreground color of the special title text in caution alerts -->
-
-<!--  Multi sliders, as in the sky animation setting -->
-<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>
-<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>
-<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>
-<MultiSliderTrackColor value="30, 30, 30, 255"/>
-<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>
-<MultiSliderTriangleColor value="255, 255, 50, 255"/>
-
+<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
+<GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
+<ConsoleBackground value="0, 0, 0, 255" />              <!-- Background for inworld chat -->
+ 
 </settings>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index c3058c4..076598c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -36,9 +36,12 @@
         </string>
         <button bottom="-40" follows="left|top" height="20" label="Profile..." left="5"
              name="profile_callee_btn" width="80" />
+        <button bottom_delta="0" follows="left|top" font="SansSerif"
+             halign="center" bottom ="-40" height="20" label="Offer Teleport" left_delta="85"
+             mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
         <button bottom="-40" follows="left|top" halign="center" height="20"
              image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-             label="Call" left_delta="85" name="start_call_btn" width="100" />
+             label="Call" left_delta="107" name="start_call_btn" width="100" />
         <button bottom="-40" follows="left|top" halign="center" 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="10"
@@ -51,9 +54,6 @@
                      image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
                      name="mute_btn" tool_tip="Mute voice" width="25" />
         </panel>
-        <button bottom_delta="0" follows="right|top" font="SansSerif"
-             halign="center" bottom ="-40" height="20" label="Offer Teleport" right="-5"
-             mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
         <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
              bottom="30" embedded_items="false" enabled="false"
              follows="left|top|right|bottom" font="SansSerif" height="221" left="5"
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 5b2d310..077ab23 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
@@ -12,9 +12,11 @@
                         <button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload"
                              left_delta="65" name="reload" width="70" />
                         <combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20"
-                             left_delta="75" max_chars="255" name="address" width="280" />
+                             left_delta="75" max_chars="235" name="address" width="225" />
                         <button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go"
-                             left_delta="285" name="go" width="55" />
+                             left_delta="230" name="go" width="55" />
+                        <button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home"
+                             left_delta="60" name="home" width="55" />
                 </layout_panel>
                 <layout_panel auto_resize="false" bottom="0" height="20" left="0"
                      name="parcel_owner_controls" user_resize="false" width="540">
@@ -30,6 +32,8 @@
                         <check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20"
                              label="Always open in my web browser" left_delta="190" name="open_always"
                              width="200" />
+                        <button bottom="5" enabled="false" follows="bottom|right" height="20" label="Set Home To Here"
+                             left="-265" name="set_home" width="155" />
                         <button bottom="5" follows="bottom|right" height="20" label="Close" left="-70"
                              name="close" width="70" />
                 </layout_panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index d7ff80b..8d06657 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"

-     height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true"

-     tear_off="false" width="802">

-        <menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"

-             height="263" label="File" left="0" mouse_opaque="false" name="File"

-             opaque="true" tear_off="false" width="243">

-                <menu_item_call bottom="-29" enabled="true" height="19" label="Quit" left="0"

-                     mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">

-                        <on_click function="File.Quit" userdata="" />

-                </menu_item_call>

-        </menu>

-        <menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"

-             height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"

-             opaque="true" tear_off="false" width="153">

-                <menu_item_call bottom="-29" enabled="true" height="19" label="Preferences..." left="0"

-                     mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">

-                        <on_click function="ShowFloater" userdata="preferences" />

-                </menu_item_call>

-        </menu>

-        <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"

-             height="317" label="Help" left="80" mouse_opaque="false" name="Help"

-             opaque="true" tear_off="false" width="166">

-                <menu_item_call bottom="-29" enabled="true" height="19" label="Second Life Help" left="0"

-                     mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">

-                        <on_click function="ShowFloater" userdata="help f1" />

-                </menu_item_call>

-                <menu_item_call bottom="-48" enabled="true" height="19" label="About Second Life..." left="0"

-                     mouse_opaque="true" name="About Second Life..." width="166">

-                        <on_click function="ShowFloater" userdata="about" />

-                </menu_item_call>

-        </menu>

-</menu_bar>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
+     height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true"
+     tear_off="false" width="802">
+        <menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
+             height="263" label="File" left="0" mouse_opaque="false" name="File"
+             opaque="true" tear_off="false" width="243">
+                <menu_item_call bottom="-29" enabled="true" height="19" label="Quit" left="0"
+                     mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
+                        <on_click function="File.Quit" userdata="" />
+                </menu_item_call>
+        </menu>
+        <menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
+             height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"
+             opaque="true" tear_off="false" width="153">
+                <menu_item_call bottom="-29" enabled="true" height="19" label="Preferences..." left="0"
+                     mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">
+                        <on_click function="ShowFloater" userdata="preferences" />
+                </menu_item_call>
+        </menu>
+        <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
+             height="317" label="Help" left="80" mouse_opaque="false" name="Help"
+             opaque="true" tear_off="false" width="166">
+                <menu_item_call bottom="-29" enabled="true" height="19" label="Viewer Help" left="0"
+                     mouse_opaque="true" name="Viewer Help" shortcut="F1" width="166">
+                        <on_click function="ShowFloater" userdata="help f1" />
+                </menu_item_call>
+                <menu_item_call bottom="-48" enabled="true" height="19" label="About Imprudence..." left="0"
+                     mouse_opaque="true" name="About Imprudence..." width="166">
+                        <on_click function="ShowFloater" userdata="about" />
+                </menu_item_call>
+        </menu>
+</menu_bar>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 71044a0..682acb9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -271,6 +271,11 @@
       <on_enable function="View.EnableLastChatter" />
     </menu_item_call>
     <menu_item_separator />
+    <menu_item_call name="Web Browser" label="Web Browser"
+                    shortcut="control|B">
+      <on_click function="ShowFloater" userdata="inworld browser" />
+    </menu_item_call>
+    <menu_item_separator />
     <menu_item_check name="Toolbar" label="Toolbar">
       <on_click function="ShowFloater" userdata="toolbar" />
       <on_check function="FloaterVisible" userdata="toolbar" />
@@ -360,9 +365,9 @@
       <on_click function="View.HighlightTransparent" userdata="" />
       <on_check function="View.CheckHighlightTransparent" />
     </menu_item_check>
-    <menu_item_check name="Beacons Always On" label="Beacons Always On">
-      <on_click function="ToggleControl" userdata="BeaconAlwaysOn" />
-      <on_check control="BeaconAlwaysOn" />
+    <menu_item_check name="Beacons Always On" label="Show Beacons">
+      <on_click function="ToggleControl" userdata="BeaconsEnabled" />
+      <on_check control="BeaconsEnabled" />
     </menu_item_check>
     <menu name="Beacons" create_jump_keys="true" label="Beacons"
           opaque="true" tear_off="true">
@@ -608,6 +613,12 @@
                 userdata="movable" />
       <on_check control="SelectMovableOnly" />
     </menu_item_check>
+    <menu_item_check name="Select Only Copyable Objects"
+                     label="Select Only Copyable Objects">
+      <on_click function="Tools.SelectOnlyCopyableObjects"
+                userdata="copyable" />
+      <on_check control="SelectCopyableOnly" />
+    </menu_item_check>
     <menu_item_check name="Select By Surrounding"
                      label="Select By Surrounding">
       <on_click function="Tools.SelectBySurrounding"
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 6af19ee..d207a74 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -579,6 +579,9 @@ to his or her location:
                 <option name="Decline">
                         Decline
                 </option>
+                <option name="Ignore">
+                        Ignore
+                </option>
         </notify>
         <notify name="OfferFriendshipNoMessage" tip="false">
                 <message name="message">
@@ -593,6 +596,9 @@ see each other&apos;s online status.)
                 <option name="Decline">
                         Decline
                 </option>
+                <option name="Ignore">
+                        Ignore
+                </option>
         </notify>
         <notify name="FriendshipAccepted" tip="false">
                 <message name="message">
@@ -616,6 +622,9 @@ so you can quickly IM this resident.
                 <option name="Decline">
                         Decline
                 </option>
+                <option name="Ignore">
+                        Ignore
+                </option>
         </notify>
         <notify name="RegionRestartMinutes" tip="false">
                 <message name="message">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
index 6fa099e..c47985b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
@@ -25,15 +25,15 @@
              label="IM/Call" left_delta="0" name="IM"
              tool_tip="Open Instant Message session" width="80" />
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Info" name="Info" width="80" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
              label="Activate" name="Activate" width="80" />
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Leave" name="Leave" width="80" />
+             label="Invite..." name="Invite..." width="80" />
+        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+             label="Info" name="Info" width="80" />
         <button bottom_delta="-35" follows="top|right" font="SansSerif" height="22"
              label="Create..." name="Create" width="80" />
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
              label="Search..." name="Search..." width="80" />
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Invite..." name="Invite..." width="80" />
+             label="Leave" name="Leave" width="80" />
 </panel>
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index 19b6013..623b800 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -1,188 +1,196 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<settings version = "101">

-

-<!-- WINDOWS -->

-<TitleBarFocusColor value="50, 115, 185, 120" />        <!-- Focused window title bar highlight, no equivalent for unfocused windows -->

-<FloaterFocusBorderColor value="50, 115, 185, 75" />

-<FloaterUnfocusBorderColor value="110, 110, 110, 60" />

-<FocusBackgroundColor value="165, 180, 200, 245" />     <!-- Background color of focused floaters -->

-<DefaultBackgroundColor value="165, 180, 200, 128" />   <!-- Background color for unfocused floaters -->

-<ColorDropShadow value="0, 0, 0, 200" />                <!-- The drop shadow behind windows and menus -->

-<DefaultHighlightDark value="50, 115, 185, 255" />

-<DefaultHighlightLight value="50, 115, 185, 255" />

-<DefaultShadowDark value="50, 115, 185, 255" />

-<DefaultShadowLight value="50, 115, 185, 255" />

-

-<!-- LABELS -->

-<LabelDisabledColor value="0, 30, 60, 128" />

-<LabelSelectedColor value="255, 255, 255, 255" />

-<LabelSelectedDisabledColor value="164, 190, 237, 128" />

-<LabelTextColor value="0, 30, 60, 255" />

-

-<!-- LOGIN -->

-<LoginProgressBarBgColor value="255, 255, 255, 255" />

-<LoginProgressBarFgColor value="255, 255, 255, 255" />

-<LoginProgressBoxBorderColor value="0, 30, 60, 0" />

-<LoginProgressBoxCenterColor value="0, 0, 0, 200" />

-<LoginProgressBoxShadowColor value="0, 0, 0, 200" />

-<LoginProgressBoxTextColor value="255, 255, 255, 255"/>

-

-<!-- BUTTONS -->

-<ButtonLabelColor value="0, 30, 60, 255" />             <!-- Text labels for buttons, like the "OK" text -->

-<ButtonLabelSelectedColor value="255, 255, 255, 255" />

-<ButtonLabelDisabledColor value="0, 30, 60, 128" />

-<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" />

-<ButtonSelectedBgColor value="62, 62, 62, 255" />

-<ButtonSelectedColor value="255, 255, 255, 255" />

-<ButtonUnselectedBgColor value="62, 62, 62, 255" />

-<ButtonUnselectedFgColor value="255, 255, 255, 255" />

-<ButtonBorderColor value="239, 156, 0, 255" />

-<ButtonFlashBgColor value="255, 190, 62, 127" />

-<ButtonColor value="255, 255, 255, 255" />              <!-- Blended with button art, usually left as opaque white -->

-<ButtonImageColor value="255, 255, 255, 255" />         <!-- Blended with button art, usually left as opaque white -->

-

-<!-- SLIDERS -->

-<SliderDisabledThumbColor value="0, 0, 0, 255" />

-<SliderThumbCenterColor value="255, 255, 255, 255" />

-<SliderThumbOutlineColor value="37, 64, 99, 255" />

-<SliderTrackColor value="37, 64, 99, 255" />

-

-<!-- TEXTFIELDS -->

-<TextBgFocusColor value="255, 255, 255, 255" />         <!-- Text field background when receiving input (focused) -->

-<TextBgReadOnlyColor value="255, 255, 255, 140" />      <!-- Text field background when read-only -->

-<TextBgWriteableColor value="255, 255, 255, 255" />     <!-- Text field background when not receiving input (unfocused) -->

-<TextCursorColor value="0, 0, 0, 255" />

-<TextFgColor value="45, 48, 45, 255" />

-<TextFgReadOnlyColor value="0, 0, 0, 200" />

-<TextFgTentativeColor value="0, 0, 0, 128" />

-<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" />     <!-- i.e. About Land name that you don't own -->

-<TextEmbeddedItemColor value="0, 0, 128, 255" />

-<TextDefaultColor value="0, 20, 0, 255"/>

-  

-<!-- LISTBOXES -->

-<ScrollBgReadOnlyColor value="255, 255, 255, 140" />

-<ScrollBgWriteableColor value="255, 255, 255, 140" />

-<ScrollBGStripeColor value="145, 180, 220, 60" />

-<ScrollDisabledColor value="128, 128, 128, 204" />

-<ScrollSelectedBGColor value="50, 115, 185, 150" />

-<ScrollSelectedFGColor value="0, 30, 60, 255" />        <!-- Text color -->

-<ScrollUnselectedColor value="0, 30, 60, 255" />        <!-- Text color -->

-<ScrollHighlightedColor value="145, 180, 220, 128" />   <!-- Hover color -->

-<ScrollbarThumbColor value="120, 160, 200, 255" />

-<ScrollbarTrackColor value="183, 202, 220, 255" />

-

-<!-- MENUS -->

-<MenuBarBgColor value="185, 200, 220, 230" />

-<MenuBarGodBgColor value="100, 200, 130, 230" />

-<MenuNonProductionGodBgColor value="100, 200, 130, 230" />

-<MenuNonProductionBgColor value="230, 70, 70, 230" />

-<MenuDefaultBgColor value="210, 220, 230, 245" />

-<MenuItemDisabledColor value="0, 30, 60, 128" />        <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->

-<MenuItemEnabledColor value="0, 30, 60, 255" />         <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->

-<MenuItemHighlightBgColor value="50, 115, 185, 100" />

-<MenuItemHighlightFgColor value="0, 30, 60, 255" />     <!-- Highlighted menu text color; also treeview node selection highlight -->

-<MenuPopupBgColor value="197, 217, 234, 240" />

-

-<!--  PIE MENUS -->

-<PieMenuBgColor value="118, 156, 201, 230" />

-<PieMenuLineColor value="255, 255, 255, 60" />

-<PieMenuSelectedColor value="185, 200, 220, 120" />

-

-<!-- TOOLTIPS -->

-<ToolTipBgColor value="250, 255, 225, 230" />

-<ToolTipBorderColor value="171, 212, 245, 255" />

-<ToolTipTextColor value="0, 0, 0, 255" />

-

-<!-- NOTIFICATION POP-UPS -->

-<NotifyBoxColor value="170, 210, 255, 240" />

-<NotifyTextColor value="0, 30, 60, 255" />

-<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- the background color of caution permissions prompts -->

-<NotifyCautionWarnColor value="0, 0, 0, 255" />         <!-- the foreground color of the special title text in caution permissions prompts -->

-<GroupNotifyBoxColor value="170, 210, 255, 240" />

-<GroupNotifyTextColor value="0, 30, 60, 255" />

-

-<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->

-<ChatHistoryBgColor value="0, 30, 80, 200" />

-<ChatHistoryTextColor value="255, 255, 255, 255" />

-<IMHistoryBgColor value="0, 30, 80, 200" />

-<IMHistoryTextColor value="255, 255, 255, 255" />

-

-<!-- IN-WORLD SELECTION -->

-<SilhouetteParentColor value="255, 255, 0, 255" />

-<SilhouetteChildColor value="32, 106, 196, 255" />

-<HighlightParentColor value="171, 212, 245, 255" />

-<HighlightChildColor value="171, 212, 245, 255" />

-<HighlightInspectColor value="255, 0, 255, 255" />

-

-<!-- EDIT MODE GRID -->

-<GridFocusPointColor value="255, 255, 255, 128" />

-<GridlineColor value="255, 255, 255, 255" />

-<GridlineBGColor value="235, 235, 255, 200" />

-<GridlineShadowColor value="0, 0, 0, 80" />

-

-<!-- PROPERTY LINES -->

-<PropertyColorAvail value="0, 0, 0, 0" />

-<PropertyColorGroup value="0, 184, 184, 102" />

-<PropertyColorOther value="255, 0, 0, 102" />

-<PropertyColorSelf value="0, 255, 0, 102" />

-<PropertyColorForSale value="255, 128, 0, 102" />

-<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->

-

-<!-- Icon Enable/Disable -->

-<IconEnabledColor value="255, 255, 255, 255"/>

-<IconDisabledColor value="147, 169, 213, 200"/>

-

-<!-- MINI-MAP -->

-<NetMapBackgroundColor value="0, 0, 0, 77" />

-<NetMapYouOwnAboveWater value="0, 255, 255, 255" />

-<NetMapYouOwnBelowWater value="0, 200, 200, 255" />

-<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />

-<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />

-<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />

-<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />

-

-<!-- HELP WINDOW -->

-<HelpBgColor value="200, 209, 204, 255" />

-<HelpFgColor value="0, 0, 0, 255" />

-<HelpScrollTrackColor value="0, 0, 0, 255" />

-<HelpScrollThumbColor value="255, 255, 255, 255" />

-<HelpScrollHighlightColor value="115, 132, 155, 255" />

-<HelpScrollShadowColor value="0, 0, 0, 255" />

-

-<!-- MISC -->

-<AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->

-<FocusColor value="239, 156, 0, 255" />                 <!-- Color of the glow around UI controls with keyboard focus -->

-<FloaterButtonImageColor value="255, 255, 255, 255" />  <!-- The floater buttons (like the close box) are white images that receive this color. -->

-<ButtonCautionImageColor value="255, 255,  255, 255" /> <!-- Match the caution dialog buttons to the default -->

-<HealthTextColor value="255, 255, 255, 255" />

-<MapAutopilotColor value="255, 128, 0, 255" />

-<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->

-<ScriptBgReadOnlyColor value="180, 180, 180, 255" />

-<ParcelTextColor value="40, 40, 90, 255" />             <!-- Parcel name on menu bar, normal state -->

-<ParcelHoverColor value="70, 70, 100, 255" />           <!-- Parcel name on menu bar, hover state -->

-<TimeTextColor value="0, 30, 60, 255" />                <!-- SL Time on menu bar -->

-<BalanceTextColor value="0, 100, 40, 255" />            <!-- Linden dollar balance on menu bar -->

-<HealthTextColor value="110, 15, 15, 255" />            <!-- Damage meter text on menu bar -->

-<GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->

-<FilterBackgroundColor value="75, 75, 150, 180" /> <!-- Matching region of Inventory search text -->

-<FilterTextColor value="255, 200, 70, 255" />

-<InventoryItemSuffixColor value="120, 70, 55, 255"/>

-<InventorySearchStatusColor value="0, 0, 0, 255" />

-<ConsoleBackground value="0, 0, 0, 255" />

-<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>

-<InventoryBackgroundColor value="255, 255, 255, 80"/>

-

- <!-- Alert box colors -->

-<AlertBoxColor value="165, 180, 200, 245"/>

-<AlertTextColor value="0, 30, 60, 255"/>

-<AlertCautionBoxColor value="254, 209, 118, 255"/>      <!-- Background color of caution alerts -->

-<AlertCautionTextColor value="0, 0, 0, 255"/>           <!-- Foreground color of the special title text in caution alerts -->

-

-<!--  Multi sliders, as in the sky animation setting -->

-<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>

-<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>

-<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>

-<MultiSliderTrackColor value="30, 30, 30, 255"/>

-<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>

-<MultiSliderTriangleColor value="255, 255, 50, 255"/>

-</settings>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings version = "101">
+<!-- Additional comments by McCabe Maxsted -->
+ 
+<!-- WINDOWS -->
+<TitleBarFocusColor value="50, 115, 185, 120" />        <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
+<FloaterFocusBorderColor value="50, 115, 185, 75" />    <!-- Focused window border color -->
+<FloaterUnfocusBorderColor value="110, 110, 110, 60" /> <!-- Unfocused window border color -->
+<FocusBackgroundColor value="165, 180, 200, 245" />     <!-- Background color of focused windows -->
+<DefaultBackgroundColor value="165, 180, 200, 128" />   <!-- Background color for unfocused windows -->
+<ColorDropShadow value="0, 0, 0, 200" />                <!-- The drop shadow behind windows and menus -->
+<DefaultHighlightDark value="50, 115, 185, 255" />
+<DefaultHighlightLight value="50, 115, 185, 255" />     <!-- Unfocused border, bottom portion -->
+<DefaultShadowDark value="50, 115, 185, 255" />         <!-- Unfocused border, top portion -->
+<DefaultShadowLight value="50, 115, 185, 255" />        <!-- Tab area border for IMs -->
+ 
+<!-- WINDOW LABELS -->
+<LabelDisabledColor value="0, 30, 60, 128" />               <!-- Color for unfocused window titles -->
+<LabelSelectedColor value="255, 255, 255, 255" />           <!-- Color for mouseovered clickable labels, e.g. version info on the login screen -->
+<LabelSelectedDisabledColor value="164, 190, 237, 128" />
+<LabelTextColor value="0, 30, 60, 255" />                   <!-- Color for window labels and titles -->
+ 
+<!-- LOGIN -->
+<LoginProgressBarBgColor value="255, 255, 255, 255" />      <!-- Login progress bar background -->
+<LoginProgressBarFgColor value="255, 255, 255, 255" />      <!-- Login progress bar -->
+<LoginProgressBoxBorderColor value="0, 30, 60, 0" />        <!-- Login progress box border -->
+<LoginProgressBoxCenterColor value="0, 0, 0, 200" />        <!-- Login progress box background -->
+<LoginProgressBoxShadowColor value="0, 0, 0, 200" />        <!-- Login progress box shadow -->
+<LoginProgressBoxTextColor value="255, 255, 255, 255"/>     <!-- Login progress text -->
+ 
+<!-- BUTTONS -->
+<ButtonLabelColor value="0, 30, 60, 255" />                 <!-- Label text color for buttons, like the "OK" text -->
+<ButtonLabelSelectedColor value="255, 255, 255, 255" />     <!-- Label text color when button selected -->
+<ButtonLabelDisabledColor value="0, 30, 60, 128" />         <!-- Label text color when button disabled -->
+<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" /> <!-- Label text color when button disabled but selected -->
+<ButtonSelectedBgColor value="62, 62, 62, 255" />           <!-- Not used -->
+<ButtonSelectedColor value="255, 255, 255, 255" />          <!-- Not used -->
+<ButtonUnselectedBgColor value="62, 62, 62, 255" />         <!-- Not used -->
+<ButtonUnselectedFgColor value="255, 255, 255, 255" />      <!-- Not used -->
+<ButtonBorderColor value="239, 156, 0, 255" />              <!-- Not used -->
+<ButtonFlashBgColor value="255, 190, 62, 127" />            <!-- Color of tab flashing on incoming IM -->
+<ButtonColor value="255, 255, 255, 255" />                  <!-- Blended with button art, usually left as opaque white -->
+<ButtonImageColor value="255, 255, 255, 255" />             <!-- Button color override (also checkboxes and scroll arrows).
+                                                                 Blended with button art, usually left as opaque white -->
+ 
+<!-- SLIDERS, single line -->
+<SliderDisabledThumbColor value="0, 0, 0, 255" />           <!-- Not used -->
+<SliderThumbCenterColor value="255, 255, 255, 255" />       <!-- Unfocused slider thumb color -->
+<SliderThumbOutlineColor value="37, 64, 99, 255" />         <!-- Focused slider thumb color -->
+<SliderTrackColor value="37, 64, 99, 255" />                <!-- Not used -->
+ 
+<!-- SLIDERS, multi line (as in the sky editor) -->
+<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>           <!-- Not used -->       
+<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>       <!-- Not used -->   
+<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>            <!-- Not used -->
+<MultiSliderTrackColor value="30, 30, 30, 255"/>                <!-- Not used -->
+<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/> <!-- Not used -->
+<MultiSliderTriangleColor value="255, 255, 50, 255"/>           <!-- Not used -->
+ 
+<!-- TEXTFIELDS -->
+<TextBgFocusColor value="255, 255, 255, 255" />             <!-- Text field background when receiving input (focused) -->
+<TextBgReadOnlyColor value="255, 255, 255, 140" />          <!-- Text field background when read-only -->
+<TextBgWriteableColor value="255, 255, 255, 255" />         <!-- Text field background when not receiving input (unfocused) -->
+<TextCursorColor value="0, 0, 0, 255" />                    <!-- Cursor color in notecards and scripts only -->
+<TextFgColor value="48, 48, 45, 255" />                     <!-- Text color for all text entry fields; cursor color for line editors -->
+<TextFgReadOnlyColor value="0, 0, 0, 200" />                <!-- Text color in read-only fields -->
+<TextFgTentativeColor value="0, 0, 0, 128" />               <!-- Initial entry in text entry fields, e.g. "Click here to chat." -->
+<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 -->
+ 
+<!-- LISTBOXES -->
+<ScrollBgReadOnlyColor value="255, 255, 255, 140" />    <!-- Background of read only lists -->
+<ScrollBgWriteableColor value="255, 255, 255, 140" />   <!-- Background of editable lists, e.g. groups-->
+<ScrollBGStripeColor value="145, 180, 220, 60" />       <!-- Background stripes in sortable lists, e.g. Events Search -->
+<ScrollDisabledColor value="128, 128, 128, 204" />      
+<ScrollSelectedBGColor value="50, 115, 185, 150" />     <!-- Selected item in a list highlight -->
+<ScrollSelectedFGColor value="0, 30, 60, 255" />        <!-- Text color -->
+<ScrollUnselectedColor value="0, 30, 60, 255" />        <!-- Text color -->
+<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 -->
+ 
+<!-- MENUS -->
+<MenuBarBgColor value="185, 200, 220, 230" />               <!-- Menu bar background -->
+<MenuBarGodBgColor value="100, 200, 130, 230" />            <!-- Menu bar background with God Mode enabled -->
+<MenuNonProductionGodBgColor value="100, 200, 130, 230" />  <!-- Beta viewer menu bar background -->
+<MenuNonProductionBgColor value="230, 70, 70, 230" />       <!-- Beta viewer menu bar background with God Mode enabled -->
+<MenuDefaultBgColor value="210, 220, 230, 245" />           <!-- Menu background -->
+<MenuItemDisabledColor value="0, 30, 60, 128" />            <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
+<MenuItemEnabledColor value="0, 30, 60, 255" />             <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
+<MenuItemHighlightBgColor value="50, 115, 185, 100" />      <!-- Highlighted menu item background color -->
+<MenuItemHighlightFgColor value="0, 30, 60, 255" />         <!-- Highlighted menu item text color; also treeview node selection highlight -->
+<MenuPopupBgColor value="197, 217, 234, 240" />             <!-- Right-click menu background -->
+ 
+<!--  PIE MENUS -->
+<PieMenuBgColor value="118, 156, 201, 230" />           <!-- Color of pie menu -->
+<PieMenuLineColor value="255, 255, 255, 60" />          <!-- Color of pie menu slice separators -->
+<PieMenuSelectedColor value="185, 200, 220, 120" />     <!-- Color of pie menu slice when selected -->
+ 
+<!-- MENU BAR -->
+<ParcelTextColor value="40, 40, 90, 255" />             <!-- Parcel name on menu bar, normal state -->
+<ParcelHoverColor value="70, 70, 100, 255" />           <!-- Parcel name on menu bar, hover state -->
+<TimeTextColor value="0, 30, 60, 255" />                <!-- SL Time on menu bar -->
+<BalanceTextColor value="0, 100, 40, 255" />            <!-- Linden dollar balance on menu bar -->
+<HealthTextColor value="110, 15, 15, 255" />            <!-- Damage meter text on menu bar -->
+ 
+<!-- TOOLTIPS -->
+<ToolTipBgColor value="250, 255, 225, 230" />           <!-- Tool tips, i.e. "Hover Tips" -->
+<ToolTipBorderColor value="171, 212, 245, 255" />       <!-- Not used -->
+<ToolTipTextColor value="0, 0, 0, 255" />               <!-- Tool tips text color -->
+ 
+<!-- NOTIFICATION POP-UPS -->
+<NotifyBoxColor value="170, 210, 255, 240" />           <!-- Notification background, i.e. tp requests -->
+<NotifyTextColor value="0, 30, 60, 255" />              <!-- Notification text -->
+<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- Background color of caution permissions prompts -->
+<NotifyCautionWarnColor value="0, 0, 0, 255" />         <!-- Foreground color of the special title text in caution permissions prompts -->
+<GroupNotifyBoxColor value="170, 210, 255, 240" />      <!-- Group notices background -->
+<GroupNotifyTextColor value="0, 30, 60, 255" />         <!-- Group notices text -->
+ 
+<!-- ALERT BOX COLORS -->
+<AlertBoxColor value="165, 180, 200, 245" />            <!-- Alert floaters, like the warning before returning objects -->
+<AlertTextColor value="0, 30, 60, 255" />               <!-- Alert floater text -->
+<AlertCautionBoxColor value="254, 209, 118, 255" />     <!-- Background color of caution alerts -->
+<AlertCautionTextColor value="0, 0, 0, 255" />          <!-- Foreground color of the special title text in caution alerts -->
+ 
+<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
+<ChatHistoryBgColor value="0, 30, 80, 200" />           <!-- Local Chat background -->
+<ChatHistoryTextColor value="255, 255, 255, 255" />     <!-- Local Chat text -->
+<IMHistoryBgColor value="0, 30, 80, 200" />             <!-- Instant Message background -->
+<IMHistoryTextColor value="255, 255, 255, 255" />       <!-- Instant Message text -->
+ 
+<!-- IN-WORLD SELECTION -->
+<SilhouetteParentColor value="255, 255, 0, 255" />      <!-- Root prim selection outline -->
+<SilhouetteChildColor value="32, 106, 196, 255" />      <!-- Child prim selection outline -->
+<HighlightParentColor value="171, 212, 245, 255" />
+<HighlightChildColor value="171, 212, 245, 255" />
+<HighlightInspectColor value="255, 0, 255, 255" />      <!-- Selection outline when inspecting -->
+ 
+<!-- EDIT MODE GRID -->
+<GridFocusPointColor value="255, 255, 255, 128" />      <!-- Not used -->
+<GridlineColor value="255, 255, 255, 255" />            <!-- Grid color -->
+<GridlineBGColor value="235, 235, 255, 200" />          <!-- Grid background color -->
+<GridlineShadowColor value="0, 0, 0, 80" />             <!-- Grid drop shadow -->
+ 
+<!-- PROPERTY LINES -->
+<PropertyColorAvail value="0, 0, 0, 0" />               
+<PropertyColorGroup value="0, 184, 184, 102" />         <!-- Property group owns -->
+<PropertyColorOther value="255, 0, 0, 102" />           <!-- Property others own -->
+<PropertyColorSelf value="0, 255, 0, 102" />            <!-- Property you own -->
+<PropertyColorForSale value="255, 128, 0, 102" />       <!-- Property for sale -->
+<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->
+ 
+<!-- MEDIA ICONS -->
+<IconEnabledColor value="255, 255, 255, 255"/>          <!-- Media/music icon enabled -->
+<IconDisabledColor value="147, 169, 213, 200"/>         <!-- Media/music icon disabled -->
+ 
+<!-- MINI-MAP -->
+<NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
+<NetMapYouOwnAboveWater value="0, 255, 255, 255" />     <!-- Objects owned by you above water -->
+<NetMapYouOwnBelowWater value="0, 200, 200, 255" />     <!-- Objects owned by you below water -->
+<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />   <!-- Group owned objects above water -->
+<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />   <!-- Group owned objects below water -->
+<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />    <!-- Objects owned by others above water -->
+<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />    <!-- Objects owned by others below water -->
+<NetMapGlyphColorAvatar value="0, 255, 0, 255" />       <!-- Also the color of avatar glyphs on the map -->
+<NetMapGlyphColorFriend value="255, 255, 0, 255" />
+ 
+<!-- INVENTORY -->
+<InventoryBackgroundColor value="255, 255, 255, 80"/>           <!-- Inventory floater background -->
+<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>  <!-- "loading..." -->
+<InventoryItemSuffixColor value="120, 70, 55, 255"/>            <!-- "worn", "no modify", etc -->
+<FilterBackgroundColor value="75, 75, 150, 180" />              <!-- Inventory search background -->
+<FilterTextColor value="255, 200, 70, 255" />                   <!-- Inventory search text -->
+<InventorySearchStatusColor value="0, 0, 0, 255" />             <!-- "Searching..." -->
+ 
+<!-- HELP WINDOW -->
+<HelpBgColor value="200, 209, 204, 255" />
+<HelpFgColor value="0, 0, 0, 255" />
+<HelpScrollTrackColor value="0, 0, 0, 255" />
+<HelpScrollThumbColor value="255, 255, 255, 255" />
+<HelpScrollHighlightColor value="115, 132, 155, 255" />
+<HelpScrollShadowColor value="0, 0, 0, 255" />
+
+<!-- MISC -->
+<AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->
+<FocusColor value="239, 156, 0, 255" />                 <!-- Color of the glow around UI controls with keyboard focus -->
+<FloaterButtonImageColor value="255, 255, 255, 255" />  <!-- The floater buttons (like the close box) are white images that receive this color. -->
+<ButtonCautionImageColor value="255, 255,  255, 255" /> <!-- Match the caution dialog buttons to the default -->
+<MapAutopilotColor value="255, 128, 0, 255" />
+<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
+<GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
+<ConsoleBackground value="0, 0, 0, 255" />              <!-- Background for inworld chat -->
+ 
+</settings>
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index be28809..62c9537 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -75,30 +75,60 @@ class ViewerManifest(LLManifest):
             self.path("*.txt")
             self.end_prefix("fonts")
 
-            # skins
-            if self.prefix(src="skins"):
-                    self.path("paths.xml")
-                    # include the entire textures directory recursively
-                    if self.prefix(src="*/textures"):
-                            self.path("*.tga")
-                            self.path("*.j2c")
-                            self.path("*.jpg")
-                            self.path("*.png")
-                            self.path("textures.xml")
-                            self.end_prefix("*/textures")
-                    self.path("*/xui/*/*.xml")
-                    self.path("*/*.xml")
-                    
-                    # Local HTML files (e.g. loading screen)
-                    if self.prefix(src="*/html"):
-                            self.path("*.png")
-                            self.path("*/*/*.html")
-                            self.path("*/*/*.gif")
-                            self.end_prefix("*/html")
-                    self.end_prefix("skins")
+        # skins
+        if self.prefix(src="skins"):
+            self.path("paths.xml")
+            
+            # include the entire textures directory recursively
+            if self.prefix(src="*/textures"):
+                self.path("*.tga")
+                self.path("*.j2c")
+                self.path("*.jpg")
+                self.path("*.png")
+                self.path("textures.xml")
+                self.end_prefix("*/textures")
+
+            self.path("*/xui/*/*.xml")
+            self.path("*/*.xml")
+
+            # Local HTML files (e.g. loading screen)
+            if self.prefix(src="*/html"):
+                self.path("*.png")
+                self.path("*/*/*.html")
+                self.path("*/*/*.gif")
+                self.end_prefix("*/html")
+                
+            self.end_prefix("skins")
+            
         self.path("lsl_guide.html")
         self.path("gpu_table.txt")
 
+
+    # Gather up the README file, etc.
+    def gather_documents(self):
+        # From the top level directory (imprudence)
+        if self.prefix("../../..", dst=""):
+            self.path("README.txt")
+            self.path("MANIFESTO.txt")
+            self.path("CONTRIBUTE.txt")
+            self.path("RELEASE_NOTES.txt")
+            self.path("ChangeLog.txt")
+            self.end_prefix("../../..")
+
+        # From the linden directory
+        if self.prefix("../..", dst="doc"):
+            self.path("LICENSE-source.txt")
+            self.path("LICENSE-logos.txt", "LICENSE-artwork.txt")
+            self.end_prefix("../..")
+
+        # From the linden/doc directory
+        if self.prefix("../../doc", dst="doc"):
+            self.path("contributions.txt")
+            self.path("GPL-license.txt", "GPL.txt")
+            self.path("FLOSS-exception.txt")
+            self.end_prefix("../../doc")
+
+
     def login_channel(self):
         """Channel reported for login and upgrade purposes ONLY;
         used for A/B testing"""
@@ -161,7 +191,13 @@ class WindowsManifest(ViewerManifest):
                 #'../llkdu/relwithdebinfo/llkdu.dll',
                 #'../../libraries/i686-win32/lib/release/llkdu.dll'), 
                 #  dst='llkdu.dll')
-        self.path(src="licenses-win32.txt", dst="licenses.txt")
+
+        self.gather_documents()
+
+        if self.prefix("../..", dst="doc"):
+            self.path("LICENSE-libraries-win32.txt")
+            self.end_prefix("../..")
+
 
         self.path("featuretable.txt")
 
@@ -386,7 +422,13 @@ class DarwinManifest(ViewerManifest):
                     self.path("*.tif")
                     self.end_prefix("cursors_mac")
 
-                self.path("licenses-mac.txt", dst="licenses.txt")
+                # From the linden directory
+                if self.prefix("../..", dst="doc"):
+                    self.path("LICENSE-libraries-mac.txt")
+                    self.end_prefix("../..")
+
+                self.gather_documents()
+
                 self.path("featuretable_mac.txt")
                 self.path("SecondLife.nib")
 
@@ -525,16 +567,23 @@ class DarwinManifest(ViewerManifest):
 class LinuxManifest(ViewerManifest):
     def construct(self):
         super(LinuxManifest, self).construct()
-        self.path("licenses-linux.txt","licenses.txt")
+
         self.path("res/imprudence_icon.png","imprudence_icon.png")
         if self.prefix("linux_tools", dst=""):
-            self.path("client-readme.txt","README-linux.txt")
+            #self.path("client-readme.txt","README-linux.txt")
             #self.path("client-readme-voice.txt","README-linux-voice.txt")
             self.path("wrapper.sh","imprudence")
             self.path("handle_secondlifeprotocol.sh")
             self.path("register_secondlifeprotocol.sh")
             self.end_prefix("linux_tools")
 
+        self.gather_documents()
+
+        # From the linden directory
+        if self.prefix("../..", dst="doc"):
+            self.path("LICENSE-libraries-linux.txt")
+            self.end_prefix("../..")
+
         # Create an appropriate gridargs.dat for this package, denoting required grid.
         self.put_in_file(self.flags_list(), 'gridargs.dat')