merge with viewer-development

11 files changed, 599 insertions, 897 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
deleted file mode 100644
index b24c745bdd..0000000000
--- a/indra/newview/skins/default/xui/en/floater_lagmeter.xml
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="170"
- layout="topleft"
- name="floater_lagmeter"
- help_topic="floater_lagmeter"
- save_rect="true"
- title="LAG METER"
- width="350">
-    <floater.string
-     name="max_title_msg">
-        Lag Meter
-    </floater.string>
-    <floater.string
-     name="max_width_px">
-        360
-    </floater.string>
-    <floater.string
-     name="min_title_msg">
-        Lag
-    </floater.string>
-    <floater.string
-     name="min_width_px">
-        90
-    </floater.string>
-    <floater.string
-     name="client_text_msg">
-        Client
-    </floater.string>
-    <floater.string
-     name="client_frame_rate_critical_fps">
-        10
-    </floater.string>
-    <floater.string
-     name="client_frame_rate_warning_fps">
-        15
-    </floater.string>
-    <floater.string
-     name="client_frame_time_window_bg_msg">
-        Normal, window in background
-    </floater.string>
-    <floater.string
-     name="client_frame_time_critical_msg">
-        Client frame rate below [CLIENT_FRAME_RATE_CRITICAL]
-    </floater.string>
-    <floater.string
-     name="client_frame_time_warning_msg">
-        Client frame rate between [CLIENT_FRAME_RATE_CRITICAL] and [CLIENT_FRAME_RATE_WARNING]
-    </floater.string>
-    <floater.string
-     name="client_frame_time_normal_msg">
-        Normal
-    </floater.string>
-    <floater.string
-     name="client_draw_distance_cause_msg">
-        Possible cause: Draw distance set too high
-    </floater.string>
-    <floater.string
-     name="client_texture_loading_cause_msg">
-        Possible cause: Images loading
-    </floater.string>
-    <floater.string
-     name="client_texture_memory_cause_msg">
-        Possible cause: Too many images in memory
-    </floater.string>
-    <floater.string
-     name="client_complex_objects_cause_msg">
-        Possible cause: Too many complex objects in scene
-    </floater.string>
-    <floater.string
-     name="network_text_msg">
-        Network
-    </floater.string>
-    <floater.string
-     name="network_packet_loss_critical_pct">
-        10
-    </floater.string>
-    <floater.string
-     name="network_packet_loss_warning_pct">
-        5
-    </floater.string>
-    <floater.string
-     name="network_packet_loss_critical_msg">
-        Connection is dropping over [NETWORK_PACKET_LOSS_CRITICAL]% of packets
-    </floater.string>
-    <floater.string
-     name="network_packet_loss_warning_msg">
-        Connection is dropping [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% of packets
-    </floater.string>
-    <floater.string
-     name="network_performance_normal_msg">
-        Normal
-    </floater.string>
-    <floater.string
-     name="network_ping_critical_ms">
-        600
-    </floater.string>
-    <floater.string
-     name="network_ping_warning_ms">
-        300
-    </floater.string>
-    <floater.string
-     name="network_ping_critical_msg">
-        Connection ping time is over [NETWORK_PING_CRITICAL] ms
-    </floater.string>
-    <floater.string
-     name="network_ping_warning_msg">
-        Connection ping time is [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
-    </floater.string>
-    <floater.string
-     name="network_packet_loss_cause_msg">
-        Possible bad connection or &apos;Bandwidth&apos; pref too high.
-    </floater.string>
-    <floater.string
-     name="network_ping_cause_msg">
-        Possible bad connection or file-sharing app.
-    </floater.string>
-    <floater.string
-     name="server_text_msg">
-        Server
-    </floater.string>
-    <floater.string
-     name="server_frame_rate_critical_fps">
-        20
-    </floater.string>
-    <floater.string
-     name="server_frame_rate_warning_fps">
-        30
-    </floater.string>
-    <floater.string
-     name="server_single_process_max_time_ms">
-        20
-    </floater.string>
-    <floater.string
-     name="server_frame_time_critical_msg">
-        Simulator framerate below [SERVER_FRAME_RATE_CRITICAL]
-    </floater.string>
-    <floater.string
-     name="server_frame_time_warning_msg">
-        Simulator framerate between [SERVER_FRAME_RATE_CRITICAL] and [SERVER_FRAME_RATE_WARNING]
-    </floater.string>
-    <floater.string
-     name="server_frame_time_normal_msg">
-        Normal
-    </floater.string>
-    <floater.string
-     name="server_physics_cause_msg">
-        Possible Cause: Too many physical objects
-    </floater.string>
-    <floater.string
-     name="server_scripts_cause_msg">
-        Possible Cause: Too many scripted objects
-    </floater.string>
-    <floater.string
-     name="server_net_cause_msg">
-        Possible Cause: Too much network traffic
-    </floater.string>
-    <floater.string
-     name="server_agent_cause_msg">
-        Possible Cause: Too many moving people in region
-    </floater.string>
-    <floater.string
-     name="server_images_cause_msg">
-        Possible Cause: Too many image calculations
-    </floater.string>
-    <floater.string
-     name="server_generic_cause_msg">
-        Possible Cause: Simulator load too heavy
-    </floater.string>
-    <floater.string
-     name="smaller_label">
-        &gt;&gt;
-    </floater.string>
-    <floater.string
-     name="bigger_label">
-        &lt;&lt;
-    </floater.string>
-    <button
-     follows="top|left"
-     height="16"
-     image_selected="lag_status_good.tga"
-     image_unselected="lag_status_good.tga"
-     layout="topleft"
-     left="8"
-     name="client_lagmeter"
-     tab_stop="false"
-     tool_tip="Client lag status"
-     top="24"
-     width="16" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left_pad="3"
-     name="client"
-     top_delta="0"
-     width="128">
-        Client
-    </text>
-    <text
-     invisiblity_control="LagMeterShrunk"
-     type="string"
-     length="1"
-     bottom="40"
-     follows="left|top"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="110"
-     name="client_text"
-     right="-10">
-        Normal
-    </text>
-    <text
-     invisiblity_control="LagMeterShrunk"
-     bottom="56"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="40"
-     name="client_lag_cause"
-     right="-32" />
-    <button
-     follows="top|left"
-     height="16"
-     image_selected="lag_status_good.tga"
-     image_unselected="lag_status_good.tga"
-     layout="topleft"
-     left="8"
-     name="network_lagmeter"
-     tab_stop="false"
-     tool_tip="Network lag status"
-     top="64"
-     width="16" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left_pad="3"
-     name="network"
-     top_delta="0"
-     width="128">
-        Network
-    </text>
-    <text
-     invisiblity_control="LagMeterShrunk"
-     type="string"
-     length="1"
-     bottom="80"
-     follows="left|top"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="110"
-     name="network_text"
-     right="-10">
-        Normal
-    </text>
-    <text
-     invisiblity_control="LagMeterShrunk"
-     bottom="96"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="40"
-     name="network_lag_cause"
-     right="-32" />
-    <button
-     follows="top|left"
-     height="16"
-     image_selected="lag_status_good.tga"
-     image_unselected="lag_status_good.tga"
-     layout="topleft"
-     left="8"
-     name="server_lagmeter"
-     tab_stop="false"
-     tool_tip="Server lag status"
-     top="104"
-     width="16" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left_pad="3"
-     name="server"
-     top_delta="0"
-     width="60">
-        Server
-    </text>
-    <text
-     invisiblity_control="LagMeterShrunk"
-     type="string"
-     length="1"
-     bottom="120"
-     follows="left|top"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="110"
-     name="server_text"
-     right="-10">
-        Normal
-    </text>
-    <text
-     invisiblity_control="LagMeterShrunk"
-     bottom="136"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="40"
-     name="server_lag_cause"
-     right="-32" />
-    <button
-     follows="left|top"
-     height="20"
-     label="&gt;&gt;"
-     layout="topleft"
-     left="10"
-     name="minimize"
-	 tool_tip="Toggle floater size"
-     top_delta="24"
-     width="40">
-        <button.commit_callback
-         function="LagMeter.ClickShrink" />
-    </button>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index f9eb16d224..273954ee3e 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -104,6 +104,7 @@
 				 label="KTris Drawn per Frame"
 				 unit_label="/fr"
 				 stat="trianglesdrawnstat"
+         unit_scale="0.001"
 				 bar_min="0"
 				 bar_max="10000"
 				 tick_spacing="1000"
@@ -116,6 +117,7 @@
 				 name="ktrissec"
 				 label="KTris Drawn per Sec"
 				 unit_label="/sec"
+         unit_scale="0.001"
 				 stat="trianglesdrawnstat"
 				 bar_min="0"
 				 bar_max="200000"
@@ -222,6 +224,8 @@
 				 name="gltexmemstat"
 				 label="GL Mem"
 				 stat="gltexmemstat"
+         unit_label="MB"
+         unit_scale="0.000001"
 				 bar_min="0.f"
 				 bar_max="400.f" 
 				 tick_spacing="100.f"
@@ -235,11 +239,13 @@
 				 name="formattedmemstat"
 				 label="Formatted Mem"
 				 stat="formattedmemstat"
+         unit_label="MB"
+         unit_scale="0.000001"
 				 bar_min="0.f"
 				 bar_max="400.f" 
 				 tick_spacing="100.f"
 				 label_spacing="200.f" 
-				 precision="1"
+				 precision="3"
 				 show_per_sec="false" 
          show_bar="false">
         </stat_bar>
@@ -247,12 +253,14 @@
 			  <stat_bar
 				 name="rawmemstat"
 				 label="Raw Mem"
+         unit_label="MB"
+         unit_scale="0.000001"
 				 stat="rawmemstat"
 				 bar_min="0.f"
 				 bar_max="400.f" 
 				 tick_spacing="100.f"
 				 label_spacing="200.f" 
-				 precision="1"
+				 precision="3"
 				 show_per_sec="false" 
          show_bar="false">
         </stat_bar>
@@ -261,11 +269,13 @@
 				 name="glboundmemstat"
 				 label="Bound Mem"
 				 stat="glboundmemstat"
+         unit_label="MB"
+         unit_scale="0.000001"
 				 bar_min="0.f"
 				 bar_max="400.f" 
 				 tick_spacing="100.f"
 				 label_spacing="200.f" 
-				 precision="1"
+				 precision="3"
 				 show_per_sec="false" 
          show_bar="false">
         </stat_bar>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 5204efbf65..436e9f8fed 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2994,7 +2994,7 @@ even though the user gets a free copy.
                          use_ellipses="true"
 			 read_only="true"
 			 name="media_info"
-			 width="280" />
+			 width="180" />
       <web_browser
         visible="false"
         enabled="false"
diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
index 06d4327293..eb01294831 100644
--- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
@@ -5,7 +5,7 @@
  height="640"
  layout="topleft"
  min_height="230"
- min_width="650"
+ min_width="750"
  name="gui_preview_tool"
  help_topic="gui_preview_tool"
  single_instance="true"
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index fc7272b904..3b8ace6308 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -195,6 +195,20 @@
 
     <menu_item_separator name="sepatator2" />
     <menu_item_call
+     label="Expand all folders"
+     layout="topleft"
+     name="expand">
+        <on_click
+         function="Gear.Expand" />
+    </menu_item_call>
+    <menu_item_call
+     label="Collapse all folders"
+     layout="topleft"
+     name="collapse">
+        <on_click
+         function="Gear.Collapse" />
+    </menu_item_call>
+    <menu_item_call
      label="Rename Outfit"
      layout="topleft"
      name="rename">
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1aa55acf2d..c6d9f9ef8f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -276,30 +276,39 @@
              parameter="gestures" />
         </menu_item_check>
         <menu_item_separator/>
-        <menu_item_call
+        <menu_item_check
          label="Friends"
          name="My Friends"
          shortcut="control|shift|F">
-            <menu_item_call.on_click
+            <menu_item_check.on_check
+             function="SideTray.CheckPanelPeopleTab"
+             parameter="friends_panel" />
+            <menu_item_check.on_click
              function="SideTray.PanelPeopleTab"
              parameter="friends_panel" />
-            </menu_item_call>
-        <menu_item_call
+            </menu_item_check>
+        <menu_item_check
          label="Groups"
          name="My Groups"
          shortcut="control|shift|G">
-            <menu_item_call.on_click
+         	<menu_item_check.on_check
+             function="SideTray.CheckPanelPeopleTab"
+             parameter="groups_panel" />
+            <menu_item_check.on_click
              function="SideTray.PanelPeopleTab"
              parameter="groups_panel" />
-        </menu_item_call>
-        <menu_item_call
+        </menu_item_check>
+        <menu_item_check
          label="Nearby people"
          name="Active Speakers"
          shortcut="control|shift|A">
-            <menu_item_call.on_click
+        	 <menu_item_check.on_check
+             function="SideTray.CheckPanelPeopleTab"
+             parameter="nearby_panel" />
+            <menu_item_check.on_click
               function="SideTray.PanelPeopleTab"
               parameter="nearby_panel" />
-        </menu_item_call>
+        </menu_item_check>
         <menu_item_call
          label="Block List"
          name="Block List">
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index eea2606125..df91ad8b5e 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -254,7 +254,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          column_padding="0"
          draw_stripes="true"
          height="200"
-         follows="left|top"
+         follows="left|top|right"
          layout="topleft"
          left="0"
          right="-1"
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 cdf14572fe..e844a15118 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
@@ -30,7 +30,7 @@
     (This page does not pass the specified whitelist)
   </text>
   <line_editor 
-   max_length="1024"
+   max_length_bytes="1024"
    bottom_delta="-24" 
    enabled="true" 
    follows="left|top" 
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index f6a8af0973..765b07ed8b 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -158,6 +158,7 @@
      text_readonly_color="DkGray"
      width="487"
      show_line_numbers="true" 
+     enable_tooltip_paste="true"
      word_wrap="true">
         Loading...
     </text_editor>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index e69a17e037..f1ae14809f 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-	 height="570"
-	 layout="topleft"
-	 name="object properties"
-	 help_topic="object_properties"
-	 title="Object Profile"
-	 width="333">
-	 <panel.string
-	  name="text deed continued">
-		Deed
-	 </panel.string>
-	<panel.string
-	 name="text deed">
-		Deed
-	</panel.string>
-            <panel.string
-             name="text modify info 1">
-                You can modify this object
-            </panel.string>
-            <panel.string
-             name="text modify info 2">
-                You can modify these objects
-            </panel.string>
-            <panel.string
-             name="text modify info 3">
-                You can't modify this object
-            </panel.string>
-            <panel.string
-             name="text modify info 4">
-                You can't modify these objects
-            </panel.string>
-            <panel.string
+    height="570"
+    layout="topleft"
+    name="object properties"
+    help_topic="object_properties"
+    title="Object Profile"
+    width="333">
+  <panel.string
+      name="text deed continued">
+    Deed
+  </panel.string>
+  <panel.string
+      name="text deed">
+    Deed
+  </panel.string>
+  <panel.string
+      name="text modify info 1">
+    You can modify this object
+  </panel.string>
+  <panel.string
+      name="text modify info 2">
+    You can modify these objects
+  </panel.string>
+  <panel.string
+      name="text modify info 3">
+    You can't modify this object
+  </panel.string>
+  <panel.string
+      name="text modify info 4">
+    You can't modify these objects
+  </panel.string>
+  <panel.string
       name="text modify info 5">
     You can't modify this object across a region boundary
   </panel.string>
@@ -39,399 +39,403 @@
     You can't modify these objects across a region boundary
   </panel.string>
   <panel.string
-             name="text modify warning">
-                This object has linked parts
-            </panel.string>
-            <panel.string
-             name="Cost Default">
-                Price: L$
-            </panel.string>
-            <panel.string
-             name="Cost Total">
-                Total Price: L$
-            </panel.string>
-            <panel.string
-             name="Cost Per Unit">
-                Price Per: L$
-            </panel.string>
-            <panel.string
-             name="Cost Mixed">
-                Mixed Price
-            </panel.string>
-            <panel.string
-             name="Sale Mixed">
-                Mixed Sale
-            </panel.string>
+      name="text modify warning">
+    This object has linked parts
+  </panel.string>
+  <panel.string
+      name="Cost Default">
+    Price: L$
+  </panel.string>
+  <panel.string
+      name="Cost Total">
+    Total Price: L$
+  </panel.string>
+  <panel.string
+      name="Cost Per Unit">
+    Price Per: L$
+  </panel.string>
+  <panel.string
+      name="Cost Mixed">
+    Mixed Price
+  </panel.string>
+  <panel.string
+      name="Sale Mixed">
+    Mixed Sale
+  </panel.string>
+  <button
+      follows="top|left"
+      height="24"
+      image_hover_unselected="BackButton_Over"
+      image_pressed="BackButton_Press"
+      image_unselected="BackButton_Off"
+      layout="topleft"
+      left="8"
+      name="back_btn"
+      tab_stop="false"
+      top="0"
+      width="30"
+      use_draw_context_alpha="false" />
+  <text
+      follows="top|left|right"
+      font="SansSerifHuge"
+      height="26"
+      layout="topleft"
+      left_pad="10"
+      name="title"
+      text_color="LtGray"
+      top="0"
+      use_ellipses="true"
+      value="Object Profile"
+      width="290" />
+  <text
+      follows="top|left"
+      height="13"
+      layout="topleft"
+      left="45"
+      name="where"
+      text_color="LtGray_50"
+      value="(Inworld)"
+      width="150" />
+  <panel
+      follows="all"
+      height="490"
+      label=""
+      layout="topleft"
+      left="10"
+      help_topic=""
+      name="properties_panel"
+      top="45"
+      width="313"
+      background_visible="true"
+      bg_alpha_color="DkGray2">
+    <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left="5"
+        name="Name:"
+        top="10"
+        width="78">
+      Name:
+    </text>
+    <line_editor
+        border_style="line"
+        border_thickness="1"
+        follows="left|top|right"
+        height="20"
+        layout="topleft"
+        left_delta="78"
+        max_length_bytes="63"
+        name="Object Name"
+        top_delta="0"
+        width="225" />
+    <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left="5"
+        name="Description:"
+        top_pad="10"
+        width="78">
+      Description:
+    </text>
+    <line_editor
+        border_style="line"
+        border_thickness="1"
+        follows="left|top|right"
+        height="23"
+        layout="topleft"
+        name="Object Description"
+        select_on_focus="true"
+        left_delta="78"
+        max_length_bytes="127"
+        top_delta="-5"
+        width="225"/>
+    <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="23"
+        layout="topleft"
+        left="5"
+        name="CreatorNameLabel"
+        top_pad="12"
+        width="78">
+      Creator:
+    </text>
+    <text
+        type="string"
+        follows="left|right|top"
+        font="SansSerifSmall"
+        height="15"
+        layout="topleft"
+        left_pad="0"
+        name="Creator Name"
+        top_delta="0"
+        translate="false"
+        use_ellipses="true" 
+        width="225">
+      TestString PleaseIgnore
+    </text>
+    <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="23"
+        layout="topleft"
+        left="5"
+        name="Owner:"
+        top_pad="15"
+        width="78">
+      Owner:
+    </text>
+    <text
+        type="string"
+        follows="left|right|top"
+        font="SansSerifSmall"
+        height="15"
+        layout="topleft"
+        left_pad="0"
+        name="Owner Name"
+        top_delta="0"
+        translate="false"
+        use_ellipses="true" 
+        width="225">
+      TestString PleaseIgnore
+    </text>
+    <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="23"
+        layout="topleft"
+        left="5"
+        name="Group_label"
+        top_pad="15"
+        width="78">
+      Group:
+    </text>
     <button
-     follows="top|left"
-     height="24"
-     image_hover_unselected="BackButton_Over"
-     image_pressed="BackButton_Press"
-     image_unselected="BackButton_Off"
-     layout="topleft"
-     left="8"
-     name="back_btn"
-     tab_stop="false"
-     top="0"
-     width="30"
-     use_draw_context_alpha="false" />
-        <text
-     follows="top|left|right"
-     font="SansSerifHuge"
-     height="26"
-     layout="topleft"
-     left_pad="10"
-     name="title"
-     text_color="LtGray"
-     top="0"
-     use_ellipses="true"
-     value="Object Profile"
-     width="290" />
-	    <text
-     follows="top|left"
-     height="13"
-     layout="topleft"
-     left="45"
-     name="where"
-     text_color="LtGray_50"
-     value="(Inworld)"
-     width="150" />
-	<panel
-         follows="all"
-         height="490"
-         label=""
-         layout="topleft"
-         left="10"
-         help_topic=""
-         name="properties_panel"
-         top="45"
-         width="313"
-   background_visible="true"
-   bg_alpha_color="DkGray2">
-	    	    <text
-		     type="string"
-		     length="1"
-		     follows="left|top"
-		     height="10"
-		     layout="topleft"
-		     left="5"
-             name="Name:"
-		     top="10"
-		     width="78">
-	        Name:
-	    </text>
-	    <line_editor
-		     border_style="line"
-		     border_thickness="1"
-	    	 follows="left|top|right"
-		     height="20"
-		     layout="topleft"
-	    	 left_delta="78"
-		     max_length_bytes="63"
-             name="Object Name"
-	    	 top_delta="0"
-		     width="225" />
-	    <text
-	    type="string"
-	    length="1"
-	    follows="left|top"
-	    height="10"
-	    layout="topleft"
-	    left="5"
-             name="Description:"
-	    top_pad="10"
-	    width="78">
-	        Description:
-	    </text>
-            <line_editor
-	     border_style="line"
-    	     border_thickness="1"
-             follows="left|top|right"
-             height="23"
-             layout="topleft"
-             name="Object Description"
-             select_on_focus="true"
-    		 left_delta="78"
-		     max_length_bytes="127"
-	    	 top_delta="-5"
-	    	 width="225"/>
-	    <text
-		     type="string"
-		     length="1"
-		     follows="left|top"
-		     height="23"
-		     layout="topleft"
-    		 left="5"
-		 name="CreatorNameLabel"
-		  top_pad="12"
-		     width="78">
-	        Creator:
-    	</text>
-	    <text
-		     type="string"
-     follows="left|right|top"
-     font="SansSerifSmall"
-     height="15"
-     layout="topleft"
-     left_pad="0"
-             name="Creator Name"
-		     top_delta="0"
-		     translate="false"
-         use_ellipses="true" 
-		     width="225">
-	        TestString PleaseIgnore
-	     </text>
-	    <text
-			 type="string"
-			 length="1"
-			 follows="left|top"
-			 height="23"
-			layout="topleft"
-			left="5"
-			name="Owner:"
-			top_pad="15"
-			 width="78">
-			    Owner:
-	     </text>
-	     <text
-			    type="string"
-			    follows="left|right|top"
-			    font="SansSerifSmall"
-			    height="15"
-			    layout="topleft"
-			    left_pad="0"
-			    name="Owner Name"
-			    top_delta="0"
-			    translate="false"
-          use_ellipses="true" 
-			    width="225">
-			    TestString PleaseIgnore
-	     </text>
-	    	    <text
-			 type="string"
-			 length="1"
-			 follows="left|top"
-			 height="23"
-			 layout="topleft"
-			 left="5"
-			name="Group_label"
-			top_pad="15"
-			width="78">
-			    Group:
-	     </text>
-      		<button
-			 follows="top|left"
-			 height="10"
-			 image_disabled="Activate_Checkmark"
-			 image_selected="Activate_Checkmark"
-			 image_unselected="Activate_Checkmark"
-			 image_color="White_50"
-			 layout="topleft"
-			 left_pad="0"
-			 top_delta="0"
-			 name="button set group"
-			 tab_stop="false"
-			 tool_tip="Choose a group to share this object's permissions"
-			 width="10" />
-            <name_box
-             follows="left|top"
-             height="18"
-             initial_value="Loading..."
-             layout="topleft"
-             left_pad="5"
-             top_delta="-1"
-             name="Group Name Proxy"
-             width="150" />
-            <button
-             follows="top|left"
-             height="23"
-             label="Deed"
-             label_selected="Deed"
-             layout="topleft"
-             name="button deed"
-             top_pad="0"
-             left="81"
-             tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."
-             width="100" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="9"
-             layout="topleft"
-             top_pad="5"
-             left="5"
-             name="label click action"
-             width="280">
-                Click to:
-            </text>
-            <combo_box
-             follows="left|top"
-             height="23"
-             layout="topleft"
-             name="clickaction"
-             width="168"
-             left="81">
-                <combo_box.item
-                 label="Touch  (default)"
-                 name="Touch/grab(default)"
+        follows="top|left"
+        height="10"
+        image_disabled="Activate_Checkmark"
+        image_selected="Activate_Checkmark"
+        image_unselected="Activate_Checkmark"
+        image_color="White_50"
+        layout="topleft"
+        left_pad="0"
+        top_delta="0"
+        name="button set group"
+        tab_stop="false"
+        tool_tip="Choose a group to share this object's permissions"
+        width="10" />
+    <name_box
+        follows="left|top"
+        height="18"
+        initial_value="Loading..."
+        layout="topleft"
+        left_pad="5"
+        top_delta="-1"
+        name="Group Name Proxy"
+        width="150" />
+    <button
+        follows="top|left"
+        height="23"
+        label="Deed"
+        label_selected="Deed"
+        layout="topleft"
+        name="button deed"
+        top_pad="0"
+        left="81"
+        tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."
+        width="100" />
+    <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="9"
+        layout="topleft"
+        top_pad="5"
+        left="5"
+        name="label click action"
+        width="280">
+      Click to:
+    </text>
+    <combo_box
+        follows="left|top"
+        height="23"
+        layout="topleft"
+        name="clickaction"
+        width="168"
+        left="81">
+      <combo_box.item
+          label="Touch  (default)"
+          name="Touch/grab(default)"
           value="Touch" />
-                <combo_box.item
-                 label="Sit on object"
-                 name="Sitonobject"
+      <combo_box.item
+          label="Sit on object"
+          name="Sitonobject"
           value="Sit" />
-                <combo_box.item
-                 label="Buy object"
-                 name="Buyobject"
+      <combo_box.item
+          label="Buy object"
+          name="Buyobject"
           value="Buy" />
-                <combo_box.item
-                 label="Pay object"
-                 name="Payobject"
+      <combo_box.item
+          label="Pay object"
+          name="Payobject"
           value="Pay" />
-                <combo_box.item
-                 label="Open"
-                 name="Open"
-                 value="Open" />
-            </combo_box>
-	 <panel
-         border="false"
-         follows="left|top"
-         layout="topleft"
-         mouse_opaque="false"
-         background_visible="true"
-         bg_alpha_color="DkGray"
-         name="perms_inv"
-         left="0"
-         top_pad="15"
-         height="135"
-         width="313">
-	  <text
-             type="string"
-             length="1"
+      <combo_box.item
+          label="Open"
+          name="Open"
+          value="Open" />
+       <combo_box.item
+          label="Zoom"
+          name="Zoom"
+          value="Zoom" />
+    </combo_box>
+    <panel
+        border="false"
+        follows="left|top"
+        layout="topleft"
+        mouse_opaque="false"
+        background_visible="true"
+        bg_alpha_color="DkGray"
+        name="perms_inv"
+        left="0"
+        top_pad="15"
+        height="135"
+        width="313">
+      <text
+          type="string"
+          length="1"
           left="5"
-             top_pad="15"
-             text_color="EmphasisColor"
-	     height="15"
-             follows="left|top|right"
-             layout="topleft"
-             name="perm_modify"
-             width="310">
-                You can modify this object
-            </text>
-	  	    <text
-			 type="string"
-			 length="1"
-			 follows="left|top"
-			 height="16"
-			 layout="topleft"
-			 left="10"
-               name="Anyone can:"
-			 top_pad="8"
-			 width="100">
-			Anyone:
-	    </text>
-	    <check_box
-			 height="18"
-			 label="Copy"
-			 layout="topleft"
-			 left_pad="0"
-             name="checkbox allow everyone copy"
-			 top_delta="-2"
-			 width="90" />
-	    <check_box
-             height="18"
-             label="Move"
-             layout="topleft"
-             name="checkbox allow everyone move"
-			 left_pad="0"
-             width="150" />
-	       	<text
-			 type="string"
-			 length="1"
-			 follows="left|top"
-			 height="16"
-			 layout="topleft"
-			 left="10"
-			 name="GroupLabel"
-			 top_pad="8"
-			 width="100">
-			Group:
-    	</text>
-			    <check_box
-			 height="18"
-			 label="Share"
-			 layout="topleft"
-			 left_pad="90"
-			 top_delta="-2"
-             name="checkbox share with group"
-			 tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
-			 width="150" />
-	    	    <text
-			 type="string"
-			 length="1"
-			 follows="left|top"
-			 height="16"
-			 layout="topleft"
-			 left="10"
-			 name="NextOwnerLabel"
-			 top_pad="8"
-			 width="200"
-			 word_wrap="true">
-			Next owner:
-	    </text>
-	    <check_box
-			 height="18"
-			 label="Modify"
-			 layout="topleft"
-			 left="20"
-			 top_pad="0"
-             name="checkbox next owner can modify"
-			 width="90" />
-	    <check_box
-			 height="18"
-			 label="Copy"
-			 layout="topleft"
-			 left_pad="0"
-             name="checkbox next owner can copy"
-			 width="90" />
-	    <check_box
-			 height="18"
-			 label="Transfer"
-			 layout="topleft"
-			 left_pad="0"
-             name="checkbox next owner can transfer"
-			 tool_tip="Next owner can give away or resell this object"
-			 width="106" />
-	    </panel>
-	    <check_box
-			 height="23"
-			 label="For Sale"
-			 layout="topleft"
-			 left="20"
-             name="checkbox for sale"
-			 top_pad="10"
-			 width="100" />
-		<combo_box
-			 height="23"
-			 left_pad="0"
-			 layout="topleft"
-			 follows="left|top"
-            name="sale type"
-			 width="170">
-        <combo_box.item
-           name="Copy"
-           label="Copy"
-           value="2" />
-        <combo_box.item
-           name="Contents"
-           label="Contents"
-           value="3" />
-        <combo_box.item
-           name="Original"
-           label="Original"
-           value="1" />
-	    </combo_box>
-		<spinner
+          top_pad="15"
+          text_color="EmphasisColor"
+          height="15"
+          follows="left|top|right"
+          layout="topleft"
+          name="perm_modify"
+          width="310">
+        You can modify this object
+      </text>
+      <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="10"
+          name="Anyone can:"
+          top_pad="8"
+          width="100">
+        Anyone:
+      </text>
+      <check_box
+          height="18"
+          label="Copy"
+          layout="topleft"
+          left_pad="0"
+          name="checkbox allow everyone copy"
+          top_delta="-2"
+          width="90" />
+      <check_box
+          height="18"
+          label="Move"
+          layout="topleft"
+          name="checkbox allow everyone move"
+          left_pad="0"
+          width="150" />
+      <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="10"
+          name="GroupLabel"
+          top_pad="8"
+          width="100">
+        Group:
+      </text>
+      <check_box
+          height="18"
+          label="Share"
+          layout="topleft"
+          left_pad="90"
+          top_delta="-2"
+          name="checkbox share with group"
+          tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
+          width="150" />
+      <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="10"
+          name="NextOwnerLabel"
+          top_pad="8"
+          width="200"
+          word_wrap="true">
+        Next owner:
+      </text>
+      <check_box
+          height="18"
+          label="Modify"
+          layout="topleft"
+          left="20"
+          top_pad="0"
+          name="checkbox next owner can modify"
+          width="90" />
+      <check_box
+          height="18"
+          label="Copy"
+          layout="topleft"
+          left_pad="0"
+          name="checkbox next owner can copy"
+          width="90" />
+      <check_box
+          height="18"
+          label="Transfer"
+          layout="topleft"
+          left_pad="0"
+          name="checkbox next owner can transfer"
+          tool_tip="Next owner can give away or resell this object"
+          width="106" />
+    </panel>
+    <check_box
+        height="23"
+        label="For Sale"
+        layout="topleft"
+        left="20"
+        name="checkbox for sale"
+        top_pad="10"
+        width="100" />
+    <combo_box
+        height="23"
+        left_pad="0"
+        layout="topleft"
+        follows="left|top"
+        name="sale type"
+        width="170">
+      <combo_box.item
+          name="Copy"
+          label="Copy"
+          value="2" />
+      <combo_box.item
+          name="Contents"
+          label="Contents"
+          value="3" />
+      <combo_box.item
+          name="Original"
+          label="Original"
+          value="1" />
+    </combo_box>
+    <spinner
         follows="left|top"
         decimal_digits="0"
         increment="1"
@@ -445,17 +449,17 @@
         min_val="1"
         height="20"
         max_val="999999999" />
-      <check_box
-	   height="20"
-	   width="110"
-	   top_pad="6"
-	   label="Show in search"
-       layout="topleft"
-	   left="120"
-       name="search_check"
-       tool_tip="Let people see this object in search results" />
-            <text
-             type="string"
+    <check_box
+        height="20"
+        width="110"
+        top_pad="6"
+        label="Show in search"
+        layout="topleft"
+        left="120"
+        name="search_check"
+        tool_tip="Let people see this object in search results" />
+    <text
+        type="string"
         follows="left|top"
         name="pathfinding_attributes_label"
         top_pad="6"
@@ -466,7 +470,7 @@
     <text
         type="string"
         follows="left|top"
-             text_color="EmphasisColor"
+        text_color="EmphasisColor"
         name="pathfinding_attributes_value"
         width="130"
         word_wrap="false"
@@ -475,120 +479,120 @@
     <text
         type="string"
         text_color="EmphasisColor"
-             length="1"
+        length="1"
         top_pad="10"
-             follows="left|top"
-             layout="topleft"
-             left="10"
-             name="B:"
-             height="10"
-             width="50">
-                B:
-            </text>
-            <text
-             type="string"
-             text_color="White"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_pad="0"
-             name="O:"
-             height="10"
-             width="50">
-                O:
-            </text>
-            <text
-             type="string"
-             text_color="EmphasisColor"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_pad="0"
-             name="G:"
-             height="10"
-             width="50">
-                G:
-            </text>
-            <text
-             type="string"
-             text_color="White"
-             length="1"
-             follows="left|top"
-             left_pad="0"
-             layout="topleft"
-             name="E:"
-             height="10"
-             width="50">
-                E:
-            </text>
-            <text
-             type="string"
-             text_color="EmphasisColor"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_pad="0"
-             name="N:"
-             height="10"
-             width="50">
-                N:
-            </text>
-            <text
-             type="string"
-             text_color="White"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_pad="0"
-             name="F:"
-             height="10"
-             width="50">
-                F:
-            </text>
-		</panel>
-    <panel
-		 height="25"
-		 layout="bottomright"
-		 name="button_panel"
-		 left="5"
-		 bottom="5"
-		 width="313">
-        <button
-		     follows="bottom|left"
-		     height="23"
-		     label="Open"
-		     layout="topleft"
-		     left="5"
-		     name="open_btn"
-		     top="0"
-		     width="73" />
-	    <button
-		     follows="bottom|left"
-		     height="23"
-		     label="Pay"
-		     layout="topleft"
-		     left_pad="5"
-		     name="pay_btn"
-		     top="0"
-		     width="73" />
-	    <button
-		     follows="bottom|left"
-		     height="23"
-		     label="Buy"
-		     layout="topleft"
-		     left_pad="5"
-		     name="buy_btn"
-		     top="0"
-		     width="73" />
-        <button
-		     follows="bottom|left"
-		     height="23"
-		     label="Details"
-		     layout="topleft"
-		     left_pad="5"
-		     name="details_btn"
-		     top="0"
-		     width="74" />
+        follows="left|top"
+        layout="topleft"
+        left="10"
+        name="B:"
+        height="10"
+        width="50">
+      B:
+    </text>
+    <text
+        type="string"
+        text_color="White"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left_pad="0"
+        name="O:"
+        height="10"
+        width="50">
+      O:
+    </text>
+    <text
+        type="string"
+        text_color="EmphasisColor"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left_pad="0"
+        name="G:"
+        height="10"
+        width="50">
+      G:
+    </text>
+    <text
+        type="string"
+        text_color="White"
+        length="1"
+        follows="left|top"
+        left_pad="0"
+        layout="topleft"
+        name="E:"
+        height="10"
+        width="50">
+      E:
+    </text>
+    <text
+        type="string"
+        text_color="EmphasisColor"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left_pad="0"
+        name="N:"
+        height="10"
+        width="50">
+      N:
+    </text>
+    <text
+        type="string"
+        text_color="White"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left_pad="0"
+        name="F:"
+        height="10"
+        width="50">
+      F:
+    </text>
+  </panel>
+  <panel
+      height="25"
+      layout="bottomright"
+      name="button_panel"
+      left="5"
+      bottom="5"
+      width="313">
+    <button
+        follows="bottom|left"
+        height="23"
+        label="Open"
+        layout="topleft"
+        left="5"
+        name="open_btn"
+        top="0"
+        width="73" />
+    <button
+        follows="bottom|left"
+        height="23"
+        label="Pay"
+        layout="topleft"
+        left_pad="5"
+        name="pay_btn"
+        top="0"
+        width="73" />
+    <button
+        follows="bottom|left"
+        height="23"
+        label="Buy"
+        layout="topleft"
+        left_pad="5"
+        name="buy_btn"
+        top="0"
+        width="73" />
+    <button
+        follows="bottom|left"
+        height="23"
+        label="Details"
+        layout="topleft"
+        left_pad="5"
+        name="details_btn"
+        top="0"
+        width="74" />
 
-	</panel>
+  </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 2157a05bbf..18d1854f67 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1447,7 +1447,7 @@ integer llScriptDanger(vector pos)
 Returns TRUE if pos is over public land, sandbox land, land that doesn&apos;t allow everyone to edit and build, or land that doesn&apos;t allow outside scripts
 	</string>
 	<string name="LSLTipText_llDialog" translate="false">
-llDialog(key avatar, string message, list buttons, integer chat_channel
+llDialog(key avatar, string message, list buttons, integer chat_channel)
 Shows a dialog box on the avatar&apos;s screen with a message and up to 12 buttons.
 If a button is pressed, the avatar says the text of the button label on chat_channel.
 	</string>