Merge from default branch.

--HG--
branch : product-engine

6 files changed, 53 insertions, 23 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index 4b91dc6294..c52b0c83d0 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -6,6 +6,7 @@
    layout="topleft" 
    left="0"
    width="380"
+   help_topic="panel_landmarks"
    border="true"
    background_visible="true"
    bg_alpha_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index e00f654750..89f1fe35ca 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -221,12 +221,23 @@
    width="50" />
    
   <text bottom_delta="0" follows="top|left" height="15" left_delta="60" name="X_label">
-    X
+	X
   </text>
-  <spinner bottom_delta="0"
-	     decimal_digits="0" enabled="true" follows="left|top" height="16"
-	     increment="1" initial_val="256" label="" label_width="0"
-	     left_delta="20" max_val="2048" min_val="0" mouse_opaque="true"
-	     name="height_pixels" width="50" />
+  <spinner 
+	  bottom_delta="0"
+	  decimal_digits="0"
+	  enabled="true"
+	  follows="left|top" 
+	  height="16"
+	  increment="1"
+	  initial_val="256" 
+	  label=""
+	  label_width="0"
+	  left_delta="20" 
+	  max_val="2048" 
+	  min_val="0"
+	  mouse_opaque="true"
+	  name="height_pixels"
+	  width="50" />
  
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index af4c01185a..8b86067b03 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -9,6 +9,11 @@
 	width="800">
   <string name="control_background_image_name">Inspector_Background</string>
   <string name="skip_step">0.2</string>
+  <string name="min_width">400</string>
+  <string name="min_height">120</string>
+  <string name="zoom_near_padding">1.0</string>
+  <string name="zoom_medium_padding">1.25</string>
+  <string name="zoom_far_padding">1.5</string>
   <panel
 	  name="media_region"
 	  bottom="125"
@@ -20,7 +25,7 @@
 	  name="media_controls"
 	  follows="left|right"
 	  animate="false"
-	  height="32"
+	  height="26"
 	  layout="topleft"
 	  left="0"
 	  orientation="horizontal"
@@ -235,18 +240,17 @@
 		width="190"
 		min_width="90">
 	  <!--
-		  RE-ENABLE THIS WHEN WE HAVE A HISTORY DROP-DOWN AGAIN
-
-<combo_box
-name="media_address_url"
-allow_text_entry="true"
-height="22"
-layout="topleft"
-max_chars="1024"
-tool_tip = "Media URL"
-<combo_box.commit_callback
-function="MediaCtrl.CommitURL" />
-</combo_box>
+	  RE-ENABLE THIS WHEN WE HAVE A HISTORY DROP-DOWN AGAIN
+	  <combo_box
+		  name="media_address_url"
+		  allow_text_entry="true"
+		  height="22"
+		  layout="topleft"
+		  max_chars="1024"
+		  tool_tip = "Media URL">
+		<combo_box.commit_callback
+			function="MediaCtrl.CommitURL" />
+	  </combo_box>
 	  -->
 	  <line_editor 
 		  name="media_address_url"
@@ -304,17 +308,17 @@ function="MediaCtrl.CommitURL" />
 		user_resize="false"
 		follows="left|right|top|bottom"
 		layout="topleft"
+		height="16"		
 		min_width="100"
 		width="200">
 	  <slider_bar
 		  name="media_play_slider"
 		  follows="left|right|top"
-		  height="22"
+		  height="16"
 		  increment="0.05"
 		  initial_value="0.5"
 		  layout="topleft"
 		  tool_tip="Movie play progress"
-		  top="8"
 		  min_width="100"
 		  width="200">
 		<slider_bar.commit_callback
@@ -619,7 +623,7 @@ function="MediaCtrl.CommitURL" />
   </layout_stack>
   <layout_stack
 	  follows="left|right|bottom"
-	  height="32"
+	  height="20"
 	  layout="topleft"
 	  animate="false"
 	  left="0"
@@ -632,7 +636,7 @@ function="MediaCtrl.CommitURL" />
 		user_resize="false" />
 	<panel
 		name="media_progress_indicator"
-		height="22"
+		height="20"
 		layout="topleft"
 		left="0"
 		top="0"
@@ -644,6 +648,7 @@ function="MediaCtrl.CommitURL" />
 		  name="media_progress_bar"
 		  color_bar="1 1 1 0.96"
 		  follows="left|right|top"
+		  top="5"
 		  height="8"
 		  layout="topleft"
 		  left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 65bc48265d..9c66653e3c 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -81,6 +81,17 @@
      name="volume_btn"
      tool_tip="Global Volume Control"
      width="16" />
+    <panel
+     class="panel_volume_pulldown"
+     follows="all"
+     height="533"
+     layout="topleft"
+     left="0"
+     name="volume_pulldown"
+     top="5"
+     visible="false"
+     width="313" />
+
     <text
      enabled="true"
      follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
index 01204ba779..32fc9fce01 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Teleport History" bottom="0" height="326" left="0" width="380"
+     help_topic="panel_teleport_history"
      border="true" follows="left|top|right|bottom">     
     <accordion
      follows="left|top|right|bottom"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4b727e36ab..e47ec1ebda 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -267,6 +267,7 @@
 	<string name="ChangePermissions">Change its permissions</string>
 	<string name="TrackYourCamera">Track your camera</string>
 	<string name="ControlYourCamera">Control your camera</string>
+	<string name="NotConnected">Not Connected</string>
 
 	<!-- Sim Access labels -->
 	<string name="SIM_ACCESS_PG">PG</string>