Merged in lindenlab/viewer-lynx

8 files changed, 45 insertions, 40 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
index 71ff961c59..b53698a9f2 100644
--- a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
@@ -7,29 +7,22 @@
          save_rect="true"
          save_visibility="true"
          title="SCENE LOAD STATISTICS"
-         width="260">
-    <button follows="top|left"
-            top="20"
-            bottom="60"
-            left="10"
-            width="100"
-            label="Pause"
-            name="playpause"/>
+         width="400">
     <scroll_container follows="top|left|bottom|right"
                       bottom="400"
                       layout="topleft"
                       left="0"
                       name="statistics_scroll"
                       reserve_scroll_corner="true"
-                      top="60"
-                      width="260">
+                      top="20"
+                      width="395">
       <container_view follows="top|left|bottom|right"
                       height="378"
                       layout="topleft"
                       left="2"
                       name="statistics_view"
                       top="20"
-                      width="245" >
+                      width="380" >
 <!--Basic Section-->
 		  <stat_view name="basic"
                  label="Basic"
diff --git a/indra/newview/skins/default/xui/en/floater_script_limits.xml b/indra/newview/skins/default/xui/en/floater_script_limits.xml
index 6b36cdfcc5..96b2ceec63 100644
--- a/indra/newview/skins/default/xui/en/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_limits.xml
@@ -8,7 +8,8 @@
  name="scriptlimits"
  save_rect="true"
  title="SCRIPT INFORMATION"
- width="480">
+ min_width="620"
+ width="620">
     <tab_container
      bottom="555"
      follows="left|right|top|bottom"
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index 90f9591f29..be9b93837a 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -8,7 +8,7 @@
          save_rect="true"
          save_visibility="true"
          title="STATISTICS"
-         width="260">
+         width="270">
   <scroll_container follows="all"
                     height="380"
                     layout="topleft"
@@ -16,14 +16,14 @@
                     name="statistics_scroll"
                     reserve_scroll_corner="true"
                     top="20"
-                    width="260">
+                    width="265">
     <container_view follows="all"
                     height="378"
                     layout="topleft"
-                    left="2"
+                    left="0"
                     name="statistics_view"
                     top="20"
-                    width="245" >
+                    width="250" >
      <stat_view name="basic"
                  label="Basic"
                  setting="OpenDebugStatBasic">
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 61002bf1b5..5b8a9413bf 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -457,6 +457,14 @@
          function="Inventory.DoToSelected"
          parameter="removefromoutfit" />
     </menu_item_call>
+    <menu_item_call
+     label="Copy outfit list to clipboard"
+     layout="topleft"
+     name="Copy outfit list to clipboard">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="copyoutfittoclipboard" />
+    </menu_item_call>
     <menu_item_separator
      layout="topleft"
      name="Outfit Separator" />
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 98dcdcd1dc..f911c2da7b 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -448,7 +448,7 @@
              parameter="mini_map" />
         </menu_item_check>
         <menu_item_check
-        label="Search"
+        label="Search..."
         name="Search"
         shortcut="control|F">
             <menu_item_check.on_check
diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml
index 629d8567d1..2c2803a503 100644
--- a/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml
@@ -8,7 +8,7 @@
  left="0"
  name="script_limits_my_avatar_panel"
  top="0"
- width="480">
+ width="620">
 	<text
 	 type="string"
 	 length="1"
@@ -19,7 +19,7 @@
 	 name="script_memory"
 	 top_pad="24"
 	 text_color="White"
-	 width="480">
+	 width="620">
 		Avatar Script Usage
 	</text>
 	<text
@@ -31,7 +31,7 @@
 	 left="30"
 	 name="memory_used"
 	 top_delta="18"
-	 width="480">
+	 width="620">
 
 	</text>
 	<text
@@ -43,7 +43,7 @@
 	 left="30"
 	 name="urls_used"
 	 top_delta="18"
-	 width="480">
+	 width="620">
 
 	</text>
 	<text
@@ -56,7 +56,7 @@
      name="loading_text"
      top="80"
      text_color="EmphasisColor"
-     width="480">
+     width="620">
         Loading...
     </text>
     <scroll_list
@@ -68,7 +68,7 @@
      multi_select="true"
      name="scripts_list"
      top="100"
-     width="460">
+     width="600">
         <scroll_list.columns
          label="Size (kb)"
          name="size"
diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
index c5e8bf5803..79bb781bc6 100644
--- a/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
@@ -8,7 +8,7 @@
  name="script_limits_region_memory_panel"
  top="0"
  left="0"
- width="480">
+ width="620">
 	<text
 	 type="string"
 	 length="1"
@@ -19,7 +19,7 @@
 	 name="script_memory"
 	 top_pad="24"
 	 text_color="White"
-	 width="480">
+	 width="620">
 	   Parcel Script Memory
 	</text>
 	<text
@@ -32,7 +32,7 @@
 	 name="parcels_listed"
 	 top_delta="18"
 	 visible="true"
-	 width="480">
+	 width="620">
 	 
 	</text>
 	<text
@@ -44,7 +44,7 @@
 	 left="30"
 	 name="memory_used"
 	 top_delta="18"
-	 width="480">
+	 width="620">
 	</text>
 	
 	<text
@@ -56,7 +56,7 @@
 	 left="30"
 	 name="urls_used"
 	 top_delta="18"
-	 width="480">
+	 width="620">
 	 
 	</text>
 	<text
@@ -69,7 +69,7 @@
      name="loading_text"
      top_delta="12"
      text_color="EmphasisColor"
-     width="480">
+     width="620">
         Loading...
     </text>
     <scroll_list
@@ -83,7 +83,7 @@
      sort_ascending="true"
      name="scripts_list"
      top_delta="16"
-     width="460">
+     width="600">
         <scroll_list.columns
          label="Size (kb)"
          name="size"
@@ -120,23 +120,23 @@
      left="10"
      width="100" />
     <button
-     follows="bottom|right"
+     follows="bottom|left"
      height="19"
-     label="Highlight"
+     label="Return"
 	 visible="false"
-     layout="bottomright"
-     left="370"
-     name="highlight_btn"
+     layout="bottomleft"
+     name="return_btn"
      top="34"
+     left_delta="390"
      width="100" />
     <button
-     follows="bottom|right"
+     follows="bottom|left"
      height="19"
-     label="Return"
+     label="Highlight"
 	 visible="false"
-     layout="bottomright"
-     name="return_btn"
+     layout="bottomleft"
+     left_delta="105"
+     name="highlight_btn"
      top="34"
-     left_delta="-105"
      width="100" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 8d84dd47ab..88ad8bbf7b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4200,6 +4200,9 @@ Try enclosing path to the editor with double quotes.
     Loading...
   </string>
 
+  <!-- Statistics -->
+  <string name="na">n/a</string>
+
   <!-- Presets graphic/camera -->
   <string name="preset_combo_label">-Empty list-</string>
   <string name="Default">Default</string>