automated merge from viewer-development root

5 files changed, 40 insertions, 36 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index efd96624ab..6370ff9243 100644
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
@@ -7,8 +7,8 @@
  follows="top|right"
  height="174"
  layout="topleft"
- min_height="174"
- min_width="174"
+ min_height="128"
+ min_width="128"
  name="Map"
  title=""
  help_topic="map"
@@ -19,40 +19,8 @@
  top="0"
  width="200">
     <floater.string
-     name="mini_map_north">
-        N
-    </floater.string>
-    <floater.string
-     name="mini_map_east">
-        E
-    </floater.string>
-    <floater.string
-     name="mini_map_west">
-        W
-    </floater.string>
-    <floater.string
-     name="mini_map_south">
-        S
-    </floater.string>
-    <floater.string
-     name="mini_map_southeast">
-        SE
-    </floater.string>
-    <floater.string
-     name="mini_map_northeast">
-        NE
-    </floater.string>
-    <floater.string
-     name="mini_map_southwest">
-        SW
-    </floater.string>
-    <floater.string
-     name="mini_map_northwest">
-        NW
-    </floater.string>
-    <floater.string
      name="ToolTipMsg">
-        [AGENT][REGION](Double-click to open Map)
+        [REGION](Double-click to open Map, shift-drag to pan)
     </floater.string>
     <floater.string name="mini_map_caption">
 	MINIMAP
diff --git a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
new file mode 100644
index 0000000000..1466c2d2a5
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+ can_close="false"
+ can_resize="true">
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml
index f5ea3e735b..8fe89d3934 100644
--- a/indra/newview/skins/default/xui/en/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml
@@ -29,6 +29,7 @@
          function="Minimap.Zoom"
          parameter="far" />
     </menu_item_call>
+    <menu_item_separator />
     <menu_item_check
        label="Rotate Map"
        name="Rotate Map">
@@ -38,6 +39,15 @@
              function="ToggleControl"
              parameter="MiniMapRotate" />
     </menu_item_check>
+    <menu_item_check
+       label="Auto Center"
+       name="Auto Center">
+          <menu_item_check.on_check
+             control="MiniMapAutoCenter" />
+          <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="MiniMapAutoCenter" />
+    </menu_item_check>
     <menu_item_separator />
     <menu_item_call
      label="Stop Tracking"
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
index 588342595e..5d58a9d289 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
@@ -57,4 +57,13 @@
         <on_click
          function="Avatar.Pay" />
     </menu_item_call>
+    <menu_item_call
+    label="Offer Teleport"
+    name="teleport">
+      <menu_item_call.on_click
+       function="Avatar.OfferTeleport"/>
+      <menu_item_call.on_enable
+      function="Avatar.EnableItem"
+      parameter="can_offer_teleport"/>
+    </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
index 0a9c70303e..60c2e0830c 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
@@ -20,7 +20,19 @@
      value="Side Panel"
      width="255" />
      <button
-     follows="left|right|top"
+     follows="right|top"
+     height="16"
+     image_selected="Icon_Dock_Press"
+     image_unselected="Icon_Dock_Foreground"
+     image_disabled="Icon_Dock_Press"
+     layout="topleft"
+     name="dock"
+     top="10"
+     right="-28"
+     width="16"
+     tool_tip="Dock/Undock tab" />
+     <button
+     follows="right|top"
      height="16"
      image_selected="Icon_Help_Press"
      image_unselected="Icon_Help_Foreground"