Merge branch 'master' (DRTVWR-548) into DRTVWR-559

# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llrender/llrendertarget.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp

10 files changed, 143 insertions, 89 deletions

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 1085972d9e..c3ce83e834 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -514,8 +514,8 @@
      name="MapFrustumColor"
      reference="White_10" />
     <color
-     name="MapFrustumRotatingColor"
-     value="1 1 1 0.2" />
+     name="MapParcelOutlineColor"
+     value="1 1 0 0.5" />
     <color
      name="MapTrackColor"
      reference="Red" />
@@ -607,10 +607,10 @@
      value="0 0 0 1" />
     <color
      name="NetMapGroupOwnAboveWater"
-     reference="Purple" />
+     value="0.85 0 0.85 1" />
     <color
      name="NetMapGroupOwnBelowWater"
-     value="0.78 0 0.78 1" />
+     value="0.63 0 0.63 1" />
     <color
      name="NetMapOtherOwnAboveWater"
      value="0.24 0.24 0.24 1" />
@@ -619,10 +619,10 @@
      value="0.12 0.12 0.12 1" />
     <color
      name="NetMapYouOwnAboveWater"
-     value="0 1 1 1" />
+     value="0 0.85 0.85 1" />
     <color
      name="NetMapYouOwnBelowWater"
-     value="0 0.78 0.78 1" />
+     value="0 0.63 0.63 1" />
     <color
      name="NotifyBoxColor"
      value="LtGray" />
diff --git a/indra/newview/skins/default/xui/en/floater_create_landmark.xml b/indra/newview/skins/default/xui/en/floater_create_landmark.xml
index bba30626b2..632daaec7e 100644
--- a/indra/newview/skins/default/xui/en/floater_create_landmark.xml
+++ b/indra/newview/skins/default/xui/en/floater_create_landmark.xml
@@ -88,6 +88,7 @@
      spellcheck="true"
      text_readonly_color="white"
      text_type="ascii_with_newline"
+     commit_on_focus_lost="true"
      top_pad="5"
      width="290"
      wrap="true" />
diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index b8893e11d9..9639e70544 100644
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
@@ -16,11 +16,35 @@
  width="200">
     <floater.string
      name="ToolTipMsg">
-        [REGION](Double-click to open Map, shift-drag to pan)
+        [PARCEL_NAME_MSG][PARCEL_SALE_PRICE_MSG][PARCEL_SALE_AREA_MSG][PARCEL_OWNER_MSG][REGION_NAME_MSG][TOOL_TIP_HINT_MSG]
+    </floater.string>
+    <floater.string
+     name="ParcelNameMsg">
+        [PARCEL_NAME]
+    </floater.string>
+    <floater.string
+     name="ParcelSalePriceMsg">
+        Price: L$[PRICE] (L$[PRICE_PER_SQM]/m²)
+    </floater.string>
+    <floater.string
+     name="ParcelSaleAreaMsg">
+        Area: [AREA]m²
+    </floater.string>
+    <floater.string
+     name="ParcelOwnerMsg">
+        Owner: [PARCEL_OWNER]
+    </floater.string>
+    <floater.string
+     name="RegionNameMsg">
+        Region: [REGION_NAME]
     </floater.string>
 	<floater.string
-     name="AltToolTipMsg">
-		[REGION](Double-click to teleport, shift-drag to pan)
+     name="ToolTipHintMsg">
+        Double-click to open map
+	</floater.string>
+	<floater.string
+     name="AltToolTipHintMsg">
+        Double-click to teleport
 	</floater.string>
 	<floater.string name="mini_map_caption">
 	Mini-map
@@ -37,105 +61,73 @@
     <text
      type="string"
      length="1"
-     bottom="218"
      label="N"
      layout="topleft"
-     left="0"
      name="floater_map_north"
-     right="10"
-     text_color="1 1 1 0.7"
-     top="189">
+     text_color="1 1 1 0.7">
         N
     </text>
     <text
      type="string"
      length="1"
-     bottom="218"
      label="E"
      layout="topleft"
-     left="0"
      name="floater_map_east"
-     right="10"
-     text_color="1 1 1 0.7"
-     top="189">
+     text_color="1 1 1 0.7">
         E
     </text>
     <text
      type="string"
      length="1"
-     bottom="205"
      label="W"
      layout="topleft"
-     left="0"
      name="floater_map_west"
-     right="11"
-     text_color="1 1 1 0.7"
-     top="175">
+     text_color="1 1 1 0.7">
         W
     </text>
     <text
      type="string"
      length="1"
-     bottom="218"
      label="S"
      layout="topleft"
-     left="0"
      name="floater_map_south"
-     right="10"
-     text_color="1 1 1 0.7"
-     top="189">
+     text_color="1 1 1 0.7">
         S
     </text>
     <text
      type="string"
      length="1"
-     bottom="218"
      label="SE"
      layout="topleft"
-     left="0"
      name="floater_map_southeast"
-     right="20"
-     text_color="1 1 1 0.7"
-     top="189">
+     text_color="1 1 1 0.7">
         SE
     </text>
     <text
      type="string"
      length="1"
-     bottom="218"
      label="NE"
      layout="topleft"
-     left="0"
      name="floater_map_northeast"
-     right="20"
-     text_color="1 1 1 0.7"
-     top="189">
+     text_color="1 1 1 0.7">
         NE
     </text>
     <text
      type="string"
      length="1"
-     bottom="218"
      label="SW"
      layout="topleft"
-     left="0"
      name="floater_map_southwest"
-     right="20"
-     text_color="1 1 1 0.7"
-     top="189">
+     text_color="1 1 1 0.7">
         SW
     </text>
     <text
      type="string"
      length="1"
-     bottom="218"
      label="NW"
      layout="topleft"
-     left="0"
      name="floater_map_northwest"
-     right="20"
-     text_color="1 1 1 0.7"
-     top="189">
+     text_color="1 1 1 0.7">
         NW
     </text>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index e499ddbc2f..21c894d3af 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -830,6 +830,7 @@
                         <combo_item name="physics_medium"> Medium </combo_item>
                         <combo_item name="physics_low">    Low    </combo_item>
                         <combo_item name="physics_lowest"> Lowest </combo_item>
+                        <combo_item name="physics_bounding_box"> Bounding Box </combo_item>
                         <combo_item name="load_from_file"> From file   </combo_item>
                     </combo_box>
                     <line_editor
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 45e11fc836..c965a4427c 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -733,6 +733,7 @@
      name="zoom_icon"
      top_pad="7"
      width="16" ></icon>
+    <!-- NOTE: min_val for zoom slider is hardcoded for performance reasons -->
     <slider
      follows="left|bottom"
      height="16"
@@ -740,7 +741,7 @@
      initial_value="-2"
      left_pad="0"
      layout="topleft"
-     max_val="0"
+     max_val="4"
      min_val="-8"
      name="zoom slider"
      show_text="false"
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 ea263d05ce..2715c916d4 100644
--- a/indra/newview/skins/default/xui/en/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml
@@ -8,63 +8,109 @@
  top="724"
  visible="false"
  width="128">
-	<menu_item_call
-     label="Zoom Close"
-     name="Zoom Close">
-        <menu_item_call.on_click
-         function="Minimap.Zoom"
+    <menu_item_check
+     label="Zoom very close"
+     name="Zoom very close">
+        <menu_item_check.on_check
+         function="Minimap.Zoom.Check"
+         parameter="very close" />
+        <menu_item_check.on_click
+         function="Minimap.Zoom.Set"
+         parameter="very close" />
+    </menu_item_check>
+    <menu_item_check
+     label="Zoom close"
+     name="Zoom close">
+        <menu_item_check.on_check
+         function="Minimap.Zoom.Check"
          parameter="close" />
-    </menu_item_call>
-    <menu_item_call
-     label="Zoom Medium"
-     name="Zoom Medium">
-        <menu_item_call.on_click
-         function="Minimap.Zoom"
+        <menu_item_check.on_click
+         function="Minimap.Zoom.Set"
+         parameter="close" />
+    </menu_item_check>
+    <menu_item_check
+     label="Zoom medium"
+     name="Zoom medium">
+        <menu_item_check.on_check
+         function="Minimap.Zoom.Check"
          parameter="medium" />
-    </menu_item_call>
-    <menu_item_call
-     label="Zoom Far"
-     name="Zoom Far">
-        <menu_item_call.on_click
-         function="Minimap.Zoom"
+        <menu_item_check.on_click
+         function="Minimap.Zoom.Set"
+         parameter="medium" />
+    </menu_item_check>
+    <menu_item_check
+     label="Zoom far"
+     name="Zoom far">
+        <menu_item_check.on_check
+         function="Minimap.Zoom.Check"
          parameter="far" />
-    </menu_item_call>
-	<menu_item_call
-     label="Zoom Default"
-     name="Zoom Default">
-		<menu_item_call.on_click
-         function="Minimap.Zoom"
-         parameter="default" />
-	</menu_item_call>
+        <menu_item_check.on_click
+         function="Minimap.Zoom.Set"
+         parameter="far" />
+    </menu_item_check>
 	<menu_item_separator />
     <menu_item_check
-       label="Rotate Map"
-       name="Rotate Map">
+       label="North at top"
+       name="North at top">
           <menu_item_check.on_check
-             control="MiniMapRotate" />
+             function="Minimap.MapOrientation.Check"
+             parameter="north_at_top" />
           <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="MiniMapRotate" />
+             function="Minimap.MapOrientation.Set"
+             parameter="north_at_top" />
     </menu_item_check>
     <menu_item_check
-       label="Auto Center"
-       name="Auto Center">
+       label="Camera at top"
+       name="Camera at top">
           <menu_item_check.on_check
-             control="MiniMapAutoCenter" />
+             function="Minimap.MapOrientation.Check"
+             parameter="camera_at_top" />
           <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="MiniMapAutoCenter" />
+             function="Minimap.MapOrientation.Set"
+             parameter="camera_at_top" />
+    </menu_item_check>
+	<menu_item_separator />
+    <menu_item_check
+     label="Show parcel boundaries"
+     name="Show parcel boundaries">
+        <menu_item_check.on_check
+         control="MiniMapShowPropertyLines" />
+        <menu_item_check.on_click
+         function="ToggleControl"
+         parameter="MiniMapShowPropertyLines" />
     </menu_item_check>
     <menu_item_separator />
+    <menu_item_check
+     label="Auto-center map"
+     name="Auto-center map">
+        <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="Re-center map"
+     name="Re-center map">
+        <menu_item_call.on_click
+         function="Minimap.Center.Activate" />
+    </menu_item_call>
     <menu_item_call
-     label="Stop Tracking"
-     name="Stop Tracking">
+     label="Stop tracking"
+     name="Stop tracking">
         <menu_item_call.on_click
          function="Minimap.Tracker"
          parameter="task_properties" />
     </menu_item_call>
     <menu_item_separator />
     <menu_item_call
+     label="About Land"
+     name="About Land">
+        <menu_item_call.on_click
+         function="Minimap.AboutLand" />
+    </menu_item_call>
+    <menu_item_call
      label="World Map"
      name="World Map">
         <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index eef8195580..cb2f24334c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3349,6 +3349,18 @@ function="World.EnvPreset"
                  function="Advanced.DropPacket" />
             </menu_item_call>
         </menu>
+        <menu
+         create_jump_keys="true"
+         label="Cache"
+         name="Cache"
+         tear_off="true">
+            <menu_item_call
+             label="Purge Disk Cache"
+             name="Purge Disk Cache">
+                <menu_item_call.on_click
+                 function="Advanced.PurgeDiskCache" />
+            </menu_item_call>
+        </menu>
         <menu_item_call
          label="Dump Scripted Camera"
          name="Dump Scripted Camera">
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index aa1b929412..54f038c24f 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -155,6 +155,7 @@
      right="-3"
      mouse_opaque="true"
      name="speaking_indicator"
+     tool_tip="Voice volume"
      visible="true"
      width="20" />
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml
index 5e3de180f9..331ba889d8 100644
--- a/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml
@@ -14,7 +14,7 @@
 				<label name="favorites_bar_label" tool_tip="Перетаскивайте сюда закладки, чтобы было удобнее переходить в любимые места в Second Life!">
 					Избранное
 				</label>
-				<more_button name="&gt;&gt;" tool_tip="Показать больше избранного">
+				<more_button name="&gt;&gt;" tool_tip="Показать больше избранного" width="60">
 					Больше ▼
 				</more_button>
 			</favorites_bar>
diff --git a/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml b/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml
index 8d43e3fb5a..ae9bc33bfa 100644
--- a/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml
@@ -14,7 +14,7 @@
 				<label name="favorites_bar_label" tool_tip="Second Life içerisinde sık kullandığınız yerlere hızla erişmek için Yer İmlerini buraya sürükleyin!">
 					Favoriler Çubuğu
 				</label>
-				<more_button name="&gt;&gt;" tool_tip="Favorilerimden daha çok göster">
+				<more_button name="&gt;&gt;" tool_tip="Favorilerimden daha çok göster" width="65">
 					Daha Fazla ▼
 				</more_button>
 			</favorites_bar>