Merge remote branch 'mccabe/next' into next

14 files changed, 229 insertions, 97 deletions

diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 8f0fc29..b90f8aa 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -162,7 +162,9 @@
 <MapAvatar value="0, 255, 0, 255" />                    <!-- Your avatar's glyph color -->
 <MapFriend value="255, 255, 0, 255" />                  <!-- Your friends' glyph color -->
 <MapMuted value="128, 128, 128, 255" />                 <!-- Muted avatars' glyph color -->
-<MapSelected value="255, 0, 0, 255" />                 <!-- Selected avatars' glyph color -->
+<MapSelected value="255, 0, 0, 255" />                  <!-- Selected avatars' glyph color -->
+<MapImpDev value="90, 45, 101, 255" />                  <!-- Imprudence developers glyph color -->
+<MapPartner value="214, 40, 107, 255" />                <!-- (unused) Your avatar's partner's glyph color -->
   
   <!-- MINI-MAP -->
 <NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index acac138..edfe62c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -5093,7 +5093,37 @@ Would you like to visit the Second Life website to set this up?
                 </message>
         </alert>
 
-        <alert modal="true" name="ConfirmTeleportHome">
+  <alert modal="true" name="ConfirmAutoPilot">
+    <message name="message">
+      Are you sure you want to move here?
+    </message>
+    <ignore name="ignore">
+      When using auto-pilot
+    </ignore>
+    <option name="Move">
+      Move
+    </option>
+    <option name="Cancel">
+      Cancel
+    </option>
+  </alert>
+  
+  <alert modal="true" name="ConfirmDoubleClickTP">
+    <message name="message">
+      Are you sure you want to teleport here?
+    </message>
+    <ignore name="ignore">
+      When double-click teleporting
+    </ignore>
+    <option name="Teleport">
+      Teleport
+    </option>
+    <option name="Cancel">
+      Cancel
+    </option>
+  </alert>
+
+  <alert modal="true" name="ConfirmTeleportHome">
                 <message name="message">
                         Are you sure you want to teleport home?
                 </message>
@@ -5192,5 +5222,22 @@ WARNING: Don't restore if you aren't sure where the object will go!
                 </option>
         </alert>
 
+  <!-- [RLVa:KB] -->
+        <alert modal="true" name="FirstRLVGiveToRLV">
+                <message name="message">
+Folders starting with &apos;#RLV/~&apos; can automatically be placed under your #RLV shared folder after you accept the inventory offer.
+
+Please note that - if enabled - the accepted inventory items will instantly be available to scripts and will have full use of the RLV API which may cause unexpected or undesirable situations.
+
+Do you want to enable this feature?
+                </message>
+                <option name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        No
+                </option>
+  </alert>
+  <!-- [/RLVa:KB] -->
 </alerts>
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
index 09c4f31..fe04ad3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="570" min_height="570" min_width="780"
+     can_resize="true" height="590" min_height="590" min_width="780"
      name="directory" rect_control="FloaterFindRect2" title="Search Second Life"
      width="780">
-        <tab_container bottom="-570" follows="left|top|right|bottom" height="550" left="0"
+        <tab_container bottom="-590" follows="left|top|right|bottom" height="570" left="0"
              mouse_opaque="false" name="Directory Tabs" tab_position="top" width="780">
-                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+                <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
                      label="All" left="1" mouse_opaque="false" name="find_all_panel" width="778">
                         <string name="searching_text">
                                 Searching...
@@ -67,7 +67,7 @@
                         </string>
       <string name="default_search_page">"http://secondlife.com/app/search/index.php?"</string>
     </panel>
-                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+                <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
                      label="Classifieds" left="1" left_delta="68" mouse_opaque="false"
                      name="classified_panel" width="778">
                         <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
@@ -140,7 +140,7 @@
                         <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Delete" label_selected="Delete" left="80"
                              mouse_opaque="true" name="Delete" width="80" />
-                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true"                       follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+                        <scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true" draw_heading="true"                       follows="left|top|right|bottom" height="484" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="339">
                                 <column label="" name="icon" width="24" />
                                 <column label="" name="type" width="-1" />
@@ -152,8 +152,8 @@
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
                              mouse_opaque="true" name="result_text" v_pad="0" width="328" />
                 </panel>
-                <panel border="true" bottom="-549" default_tab_group="1"
-                     follows="left|top|right|bottom" height="533" label="Events" left="1"
+                <panel border="true" bottom="-569" default_tab_group="1"
+                     follows="left|top|right|bottom" height="553" label="Events" left="1"
                      mouse_opaque="false" name="events_panel" width="778">
                         <string name="searching_text">
                                 Searching...
@@ -251,8 +251,8 @@
                         <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Delete" label_selected="Delete" left="80"
                              mouse_opaque="true" name="Delete" width="80" />
-                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
-                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+                        <scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true" draw_heading="true" 
+                             follows="left|top|right|bottom" height="484" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="339">
                                 <column label="" name="icon" width="24" />
                                 <column label="" name="type" width="-1" />
@@ -272,7 +272,7 @@
                              height="20" label="&lt; Prev" label_selected="&lt; Prev"
                              mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
                 </panel>
-                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+                <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
                      label="Showcase" left="1" mouse_opaque="false" name="showcase_panel"
                      width="778">
         <string name="searching_text">Searching...</string>
@@ -304,7 +304,7 @@
         <string name="redirect_404_url">http://secondlife.com/app/search/notfound.html</string>
         <string name="default_search_page">"http://secondlife.com/app/showcase/index.php?"</string>
     </panel>
-                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+                <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
                      label="Land Sales" left="1" mouse_opaque="false" name="land_sales_panel"
                      width="778">
                         <string name="searching_text">
@@ -370,8 +370,8 @@
                                 Land can be bought direct for Linden Dollars (L$) or at auction for either L$ or US$.
 To buy direct, visit the land and click on the place name in the title bar.
                         </text>
-                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
-                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+                        <scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true" draw_heading="true" 
+                             follows="left|top|right|bottom" height="484" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="387">
                                 <column label="" name="icon" width="24" />
                                 <column label="" name="type" width="-1" />
@@ -385,7 +385,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
                              mouse_opaque="true" name="result_text" v_pad="0" width="328" />
                 </panel>
-                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+                <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
                      label="Places" left="1" mouse_opaque="false" name="places_panel"
                      width="778">
                         <string name="searching_text">
@@ -458,10 +458,10 @@ To buy direct, visit the land and click on the place name in the title bar.
                         <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
                              name="Search" width="70" />
-                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
+                        <scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true"
                              draw_heading="true" 
                              
-                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+                             follows="left|top|right|bottom" height="484" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="339">
                                 <column label="" name="icon" width="24" />
                                 <column label="" name="type" width="-1" />
@@ -473,7 +473,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
                              mouse_opaque="true" name="result_text" v_pad="0" width="328" />
                 </panel>
-    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+    <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
                      label="People" left="1" mouse_opaque="false" name="people_panel"
                      width="778">
                         <string name="searching_text">
@@ -500,10 +500,10 @@ To buy direct, visit the land and click on the place name in the title bar.
       <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"
                              name="Search" width="70" />
-      <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
+      <scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true"
                              draw_heading="true" 
                                
-                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+                             follows="left|top|right|bottom" height="484" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="326">
         <column label="" name="icon" width="24" />
         <column label="" name="type" width="-1" />
@@ -514,7 +514,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
                              mouse_opaque="true" name="result_text" v_pad="0" width="328" />
                 </panel>
-    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+    <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
                      label="Groups" left="1" mouse_opaque="false"
                      name="groups_panel"
                      width="778">
@@ -580,19 +580,19 @@ To buy direct, visit the land and click on the place name in the title bar.
       <string name="default_search_page">"http://secondlife.com/app/search/index_groups.php?"</string>
     </panel>
         </tab_container>
-        <panel bottom="-560" follows="right|top" height="470" left="340"
+        <panel bottom="-580" follows="right|top" height="490" left="340"
              name="classified_details_panel" width="440" />
-        <panel bottom="-560" follows="right|top" height="486" left="350" name="Panel Avatar"
+        <panel bottom="-580" follows="right|top" height="506" left="350" name="Panel Avatar"
              width="430" />
-        <panel bottom="-560" follows="right|top" height="470" left="340"
+        <panel bottom="-560" follows="right|top" height="490" left="340"
              name="event_details_panel" width="440" />
-        <panel bottom="-580" follows="right|top" height="515" left="350"
+        <panel bottom="-600" follows="right|top" height="535" left="350"
              name="group_details_panel_holder" width="430">
-                <panel bottom="0" follows="right|top" height="470" left="0" name="group_details_panel"
+                <panel bottom="0" follows="right|top" height="490" left="0" name="group_details_panel"
                      width="430" />
         </panel>
-        <panel bottom="20" follows="right|top" height="470" left="340"
+        <panel bottom="20" follows="right|top" height="490" left="340"
              name="place_details_panel" width="440" />
-        <panel bottom="20" follows="right|top" height="470" left="385"
+        <panel bottom="20" follows="right|top" height="490" left="385"
              name="place_details_small_panel" width="395" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index 3ae02e7..3baec3f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -92,7 +92,16 @@
   <string name="no_one_near">
     No avatars within range
   </string>
-  <string name="muted">
+  <string name="is_muted">
     (muted)
   </string>
+  <string name="is_typing">
+    (typing)
+  </string>
+  <string name="entering_chat_range">
+    [NAME] has entered chat range ([DISTANCE]m)
+  </string>
+  <string name="entering_sim_range">
+    [NAME] has entered the sim ([DISTANCE]m)
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 00f3f3e..880ba85 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -530,37 +530,37 @@
                                 </combo_item>
                         </combo_box>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-115" drop_shadow_visible="true" follows="left|top"
+                             bottom="-135" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
                              mouse_opaque="true" name="B:" v_pad="0" width="174">
                                 B:
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-115" drop_shadow_visible="true" follows="left|top"
+                             bottom="-135" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
                              mouse_opaque="true" name="O:" v_pad="0" width="124">
                                 O;
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-115" drop_shadow_visible="true" follows="left|top"
+                             bottom="-135" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
                              mouse_opaque="true" name="G:" v_pad="0" width="74">
                                 G:
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-127" drop_shadow_visible="true" follows="left|top"
+                             bottom="-147" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
                              mouse_opaque="true" name="E:" v_pad="0" width="174">
                                 E:
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-127" drop_shadow_visible="true" follows="left|top"
+                             bottom="-147" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
                              mouse_opaque="true" name="N:" v_pad="0" width="124">
                                 N:
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-127" drop_shadow_visible="true" follows="left|top"
+                             bottom="-147" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
                              mouse_opaque="true" name="F:" v_pad="0" width="74">
                                 F:
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
index b1d16a2..e962a8a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
@@ -29,21 +29,22 @@
                         <on_click function="Object.Delete" />
                         <on_enable function="Object.EnableDelete" />
                 </menu_item_call>
-                <menu_item_call enabled="false" label="Wear" mouse_opaque="true" name="Wear">
-                        <on_click function="Object.AttachToAvatar" />
-                        <on_enable function="Object.EnableWear" />
-                </menu_item_call>
-                <menu_item_call enabled="false" label="Take Copy" mouse_opaque="true" name="Take Copy">
-                        <on_click function="Tools.TakeCopy" />
-                        <on_enable function="Tools.EnableTakeCopy" />
-                </menu_item_call>
-                <pie_menu label="Attach HUD &gt;" name="Object Attach HUD" />
-                <pie_menu label="Attach &gt;" name="Object Attach" />
-                <menu_item_call enabled="false" label="Return..." mouse_opaque="true" name="Return...">
-                        <on_click function="Object.Return" />
-                        <on_enable function="Object.EnableReturn" />
-                </menu_item_call>
-                <pie_menu label="More &gt;" name="Rate Menu">
+    <menu_item_call enabled="false" label="Build" mouse_opaque="true" name="Create">
+      <on_click function="Object.Build" />
+      <on_enable function="EnableEdit" />
+    </menu_item_call>
+
+    <menu_item_call enabled="false" label="Take Copy" mouse_opaque="true" name="Take Copy">
+      <on_click function="Tools.TakeCopy" />
+      <on_enable function="Tools.EnableTakeCopy" />
+    </menu_item_call>
+    <pie_menu label="Attach HUD &gt;" name="Object Attach HUD" />
+    <pie_menu label="Attach &gt;" name="Object Attach" />
+    <menu_item_call enabled="false" label="Wear" mouse_opaque="true" name="Wear">
+      <on_click function="Object.AttachToAvatar" />
+      <on_enable function="Object.EnableWear" />
+    </menu_item_call>
+    <pie_menu label="More &gt;" name="Rate Menu">
       <menu_item_call label="Export" enabled="false" hidden="false"
                       mouse_opaqu="true" name="Export">
         <on_click function="Object.Export" />
@@ -74,10 +75,10 @@
         <on_click function="Tools.Unlink" userdata="" />
         <on_enable function="Tools.EnableUnlink" />
       </menu_item_call>
-                </pie_menu>
-    <menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create">
-      <on_click function="Object.Build" />
-      <on_enable function="EnableEdit" />
+    </pie_menu>
+    <menu_item_call enabled="false" label="Return..." mouse_opaque="true" name="Return...">
+      <on_click function="Object.Return" />
+      <on_enable function="Object.EnableReturn" />
     </menu_item_call>
         </pie_menu>
         <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit...">
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 9da0ec5..8d55a3b 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
@@ -1402,11 +1402,33 @@
 
     <menu name="RLVa" drop_shadow="true" opaque="true" tear_off="true">
 
+      <menu name="Debug" drop_shadow="true" opaque="true" tear_off="true">
+
+        <menu_item_check name="Show Debug Messages"
+                         label="Show Debug Messages">
+          <on_click function="ToggleControl" userdata="RestrainedLifeDebug" />
+          <on_check control="RestrainedLifeDebug" />
+        </menu_item_check>
+
+        <menu_item_separator />
+
+        <menu_item_check name="Enable Legacy Naming"
+                         label="Enable Legacy Naming">
+          <on_click function="ToggleControl" userdata="RLVaEnableLegacyNaming" />
+          <on_check control="RLVaEnableLegacyNaming" />
+        </menu_item_check>
+
+      </menu>
+
+      <menu_item_separator />
+
       <menu_item_check name="Enable Wear" label="Enable Wear">
         <on_click function="ToggleControl" userdata="RLVaEnableWear" />
         <on_check control="RLVaEnableWear" />
       </menu_item_check>
-      
+
+      <menu_item_separator />
+
       <menu_item_check name="Hide locked layers" label="Hide locked layers">
         <on_click function="ToggleControl" userdata="RLVaHideLockedLayers" />
         <on_check control="RLVaHideLockedLayers" />
@@ -1428,6 +1450,22 @@
       </menu_item_check>
       -->
 
+      <menu_item_separator />
+
+      <menu_item_check name="Forbid Give to #RLV" label="Forbid Give to #RLV">
+        <on_click function="ToggleControl"
+                  userdata="RestrainedLifeForbidGiveToRLV" />
+        <on_check control="RestrainedLifeForbidGiveToRLV" />
+      </menu_item_check>
+
+      <menu_item_check name="Show Name Tags" label="Show Name Tags">
+        <on_click function="ToggleControl"
+                  userdata="RLVaShowNameTags" />
+        <on_check control="RLVaShowNameTags" />
+      </menu_item_check>
+
+      <menu_item_separator />
+
       <menu_item_call name="Restrictions..." label="Restrictions...">
         <on_click function="RLVa.Behaviors.Show" userdata="" />
       </menu_item_call>
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 01e2546..2716f25 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -923,7 +923,24 @@ You can find example sculpted textures in the inventory library.
                         You have begun playing media.  Media can set to play automatically in the preferences window under Audio / Video. Note that this can be a security risk for media sites you do not trust.
                 </message>
         </notify>
-        <notify name="MaxListSelectMessage" tip="true">
+  <!-- [RLVa:KB] -->
+  <notify name="FirstRLVDetach" tip="false">
+    <message name="message">
+One of your attachments was made nondetachable using Restrained Life.
+Please note that this also disables the &apos;Wear&apos; option on all prim attachments in your inventory unless they are properly named.
+
+For more information search for &apos;Restrained Life&apos; on the SL wiki.
+    </message>
+  </notify>
+  <notify name="FirstRLVFartouch" tip="false">
+    <message name="message">
+You have been fartouch restricted: you will be unable to touch objects farther than 1.5m from your avatar until the restriction is lifted.
+
+Tip: if an object is out of range the mouse cursor will not change as you hover over it and you'll hear an error sound if you try to right-click it.
+    </message>
+  </notify>
+  <!-- [/RLVa:KB] -->
+  <notify name="MaxListSelectMessage" tip="true">
                 <message name="message">
                         You may only select up to [MAX_SELECT] items
 from this list.
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index b811a66..921cd8e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -71,7 +71,7 @@
                              label_selected="Mute" left_delta="0" mouse_opaque="true" name="Mute"
                              width="145" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-29" drop_shadow_visible="true" follows="left|top"
+                             bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
                              mouse_opaque="true" name="label" v_pad="0" width="145">
         Born:
@@ -84,17 +84,17 @@
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
-                             mouse_opaque="true" name="label2" v_pad="0" width="345">
+                             mouse_opaque="true" name="label2" v_pad="0" width="145">
         Account:
       </text>
-      <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="50" right="-12"
+      <view_border bevel_style="in" bottom_delta="-52" follows="left|top" height="52" right="-12"
                              mouse_opaque="false" name="acct_border" width="145" />
       <text bg_visible="false" border_drop_shadow_visible="false"
                              border_visible="true" bottom_delta="0" drop_shadow_visible="true"
                              follows="left|top" font="SansSerifSmall" height="48" left="264"
                              mouse_opaque="false" name="acct" width="121" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
+                             bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
                              mouse_opaque="true" name="partner_label"
                              tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index b0384cf..6233cbe 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -33,44 +33,49 @@
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
              enabled="true" follows="left|top" height="56" label="You" left="148"
-             mouse_opaque="true" name="user" width="44" />
+             mouse_opaque="true" name="user" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
-             enabled="true" follows="left|top" height="56" label="Others" left_delta="48"
-             mouse_opaque="true" name="agent" width="44" />
+             enabled="true" follows="left|top" height="56" label="Others" left_delta="68"
+             mouse_opaque="true" name="agent" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="0.6 0.6 1 1"
-             enabled="true" follows="left|top" height="56" label="IM" left_delta="48"
-             mouse_opaque="true" name="im" width="44" />
+             enabled="true" follows="left|top" height="56" label="IMs" left_delta="68"
+             mouse_opaque="true" name="im" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="0.8 1 1 1"
              enabled="true" follows="left|top"
-             height="56" label="System" left_delta="48" mouse_opaque="true"
-             name="system" width="44" />
+             height="56" label="System" left_delta="68" mouse_opaque="true"
+             name="system" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="0.82 0.82 0.99 1"
              control_name="ScriptErrorColor" enabled="true" follows="left|top"
-             height="56" label="Errors" left_delta="48" mouse_opaque="true"
-             name="script_error" width="44" />
+             height="56" label="Errors" left_delta="68" mouse_opaque="true"
+             name="script_error" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
              control_name="ObjectChatColor" enabled="true" follows="left|top"
              height="56" label="Objects" left="148" mouse_opaque="true"
-             name="objects" width="44" />
+             name="objects" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
+       control_name="ObjectIMColor" enabled="true" follows="left|top"
+             height="56" label="Object IMs" left_delta="68" mouse_opaque="true"
+       name="object_ims" width="54" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
+             can_apply_immediately="true" color="0.7 0.9 0.7 1"
              enabled="true" follows="left|top"
-             height="56" label="Owner" left_delta="48" mouse_opaque="true" name="owner"
-             width="44" />
+             height="56" label="Owner" left_delta="68" mouse_opaque="true" name="owner"
+             width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0 0 0 1"
              enabled="true" follows="left|top"
-             height="56" label="Bubble" left_delta="48" mouse_opaque="true"
-             name="background" width="44" />
+             height="56" label="Bubble" left_delta="68" mouse_opaque="true"
+             name="background" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0.6 0.6 1 1"
              enabled="true" follows="left|top" height="56"
-             label="URLs" left_delta="48" mouse_opaque="true" name="links" width="44" />
+             label="URLs" left_delta="68" mouse_opaque="true" name="links" width="54" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-185" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index bb1c5ee..0c18a62 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -77,6 +77,22 @@
              follows="left|top" height="16" increment="1" initial_val="300"
              label="Away Timeout:" label_width="141" left="10" max_val="600"
              min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
+     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+     mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
+    Mini-map notify:
+  </text>
+  <check_box bottom_delta="0" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             label="Entering chat range" left="151"
+             mouse_opaque="true" name="mini_map_notify_chat" radio_style="false"
+             width="256" />
+  <check_box bottom_delta="0" enabled="true"
+     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+     label="Entering sim" left="330"
+     mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
+     width="256" />
         <check_box bottom="-304" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Notify when Linden dollars (L$) spent or received" left="151"
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index 6a94489..f9bf283 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -162,6 +162,9 @@
 <MapAvatar value="0, 255, 0, 255" />                    <!-- Your avatar's glyph color -->
 <MapFriend value="255, 255, 0, 255" />                  <!-- Your friends' glyph color -->
 <MapMuted value="128, 128, 128, 255" />                 <!-- Muted avatars' glyph color -->
+<MapSelected value="255, 0, 0, 255" />                  <!-- Selected avatars' glyph color -->
+<MapImpDev value="90, 45, 101, 255" />                  <!-- Imprudence developers glyph color -->
+<MapPartner value="214, 40, 107, 255" />                <!-- (unused) Your avatar's partner's glyph color -->
  
 <!-- MINI-MAP -->
 <NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_chatterbox.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_chatterbox.xml
deleted file mode 100644
index 025a616..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_chatterbox.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-     height="390" name="floater_chatterbox"
-     rect_control="ChatterboxRect" title="Communicate" width="392">
-<icon enabled="false" image_name="tabarea.tga"
-             bg_alpha_color="blue" color="DefaultShadowLight" border="false"
-             bottom="-389" follows="left|right|bottom" height="17" left="1" scale_image="true"
-             mouse_opaque="false" name="chatterbox_tab_container" width="391"></icon>
-    <tab_container bottom="2" follows="left|right|top|bottom" height="370" left="0"
-             name="chatterbox_tabs" tab_position="bottom" tab_width="80" width="395" />
-</multi_floater>
-
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml
index 11859cc..d801251 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml
@@ -4,29 +4,35 @@
      min_width="400" mouse_opaque="true" name="WindLight floater"
      rect_control="FloaterAdvancedSkyRect" title="Advanced Sky Editor"
      width="700">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-50" drop_shadow_visible="true" follows="left|top|right"
              font="SansSerif" h_pad="0" halign="left" height="16"
              left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
              width="110">
-                Sky Presets:
-        </text>
-        <combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18"
+    Sky Presets:
+  </text>
+  <combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18"
              left_delta="110" max_chars="20" mouse_opaque="true" name="WLPresetsCombo"
              width="150" />
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+             label="" label_selected="" left_delta="-25" image_overlay="arrow_left.tga"
+             mouse_opaque="true" name="prev" scale_image="true" width="20" />
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+             label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga"
+             mouse_opaque="true" name="next" scale_image="true" width="20" />
         <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="New" label_selected="New" left_delta="170"
+             label="New" label_selected="New" left_delta="40"
              mouse_opaque="true" name="WLNewPreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Save" label_selected="Save" left_delta="80"
+             label="Save" label_selected="Save" left_delta="70"
              mouse_opaque="true" name="WLSavePreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Delete" label_selected="Delete" left_delta="80"
+             label="Delete" label_selected="Delete" left_delta="70"
              mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
              label="Day Cycle Editor" label_selected="Day Cycle Editor"
-             left_delta="120" mouse_opaque="true" name="WLDayCycleMenuButton"
-             scale_image="true" width="120" />
+             left_delta="100" mouse_opaque="true" name="WLDayCycleMenuButton"
+             scale_image="true" width="125" />
         <tab_container bottom="-220" follows="left|top" height="160" left="0"
              mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700">
                 <panel border="true" bottom="-220" follows="left|top|right|bottom" height="160"