Merge from ssh://hg.lindenlab.com/dessie/viewer-release

15 files changed, 207 insertions, 159 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 54ef6d65a7..b9489895ae 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -825,7 +825,7 @@ Leyla Linden               </text>
              name="Simulator primitive usage:"
              top_pad="4"
              width="364">
-               Primative usage:
+               Primitive usage:
             </text>
             <text
              type="string"
diff --git a/indra/newview/skins/default/xui/en/floater_critical.xml b/indra/newview/skins/default/xui/en/floater_critical.xml
index 7b5451553f..05c958e051 100644
--- a/indra/newview/skins/default/xui/en/floater_critical.xml
+++ b/indra/newview/skins/default/xui/en/floater_critical.xml
@@ -6,6 +6,7 @@
  height="500"
  layout="topleft"
  name="modal container"
+ open_centered="true"
  width="600">
     <button
      height="20"
@@ -16,15 +17,6 @@
      name="Continue"
      top="465"
      width="100" />
-    <button
-     height="20"
-     label="Cancel"
-     label_selected="Cancel"
-     layout="topleft"
-     left_delta="-468"
-     name="Cancel"
-     top_delta="0"
-     width="100" />
     <text
      type="string"
      length="1"
@@ -32,9 +24,9 @@
      font="SansSerif"
      height="20"
      layout="topleft"
-     left_delta="4"
+     left="20"
      name="tos_heading"
-     top_delta="-450"
+     top="20"
      width="552">
         Please read the following message carefully.
     </text>
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index 70dac7e41c..c02d607586 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -182,7 +182,7 @@
 			</button>
         </layout_panel>
         <layout_panel
-         height="20"
+         height="40"
          layout="topleft"
          left_delta="0"
          name="external_controls"
@@ -190,7 +190,7 @@
          user_resize="false"
          width="540">
             <web_browser
-             bottom="-10"
+             bottom="-30"
              follows="left|right|top|bottom"
              layout="topleft"
              left="0"
@@ -206,9 +206,9 @@
              name="open_browser"
              top_pad="5"
              width="185">
-				<button.commit_callback
-				function="MediaBrowser.OpenWebBrowser" />
-			</button>
+              <button.commit_callback
+                function="MediaBrowser.OpenWebBrowser" />
+            </button>
             <check_box
              control_name="UseExternalBrowser"
              follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
index f766fe5a5d..6281bc5272 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
@@ -39,28 +39,6 @@
      name="Title">
         Gesture: [NAME]
     </floater.string>
-  <text
-   type="string"
-   length="1"
-   follows="top|left"
-   font="SansSerifSmall"
-   height="10"
-   layout="topleft"
-   left="10"
-   name="name_text"
-   top="20"
-   font.style="BOLD"
-   width="100">
-    Name:
-  </text>
-  <line_editor
-   follows="left|top"
-   height="20"
-   layout="topleft"
-   left_delta="84"
-   name="name"
-   top_delta="-4"
-   width="180" />
     <text
      type="string"
      length="1"
@@ -70,7 +48,7 @@
      layout="topleft"
      left="10"
      name="desc_label"
-     top_pad="10"
+     top_pad="25"
      font.style="BOLD"
      width="100">
         Description:
@@ -79,10 +57,10 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="84"
+     left_delta="89"
      name="desc"
      top_delta="-4"
-     width="180" />
+     width="175" />
     <text
      type="string"
      length="1"
@@ -101,11 +79,11 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="84"
+     left_delta="89"
      max_length="31"
      name="trigger_editor"
      top_delta="-4"
-     width="180" />
+     width="175" />
     <text
      type="string"
      length="1"
@@ -125,12 +103,12 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="84"
+     left_delta="89"
      max_length="31"
      name="replace_editor"
      tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture"
      top_delta="-4"
-     width="180" />
+     width="175" />
     <text
      type="string"
      length="1"
@@ -149,7 +127,7 @@
      height="20"
      label="None"
      layout="topleft"
-     left_delta="84"
+     left_delta="89"
      name="modifier_combo"
      top_delta="-4"
      width="75" />
@@ -171,7 +149,7 @@
      left="10"
      font.style="BOLD"
      name="library_label"
-     top="135"
+     top_delta="25"
      width="100">
         Library:
     </text>
@@ -181,7 +159,7 @@
      layout="topleft"
      left="10"
      name="library_list"
-     top="150"
+     top_delta="15"
      width="180">
         <scroll_list.rows
          value="Animation" />
@@ -199,7 +177,7 @@
      layout="topleft"
      left_pad="10"
      name="add_btn"
-     top_delta="0"
+     top_delta="-1"
      width="70" />
     <text
      type="string"
@@ -230,7 +208,7 @@
      layout="topleft"
      left_pad="10"
      name="up_btn"
-     top_delta="0"
+     top_delta="-1"
      width="70" />
     <button
      follows="top|left"
@@ -256,23 +234,25 @@
      layout="topleft"
      left="15"
      name="options_text"
-     top="330"
-     width="205" />
+     top="315"
+     width="205">
+	 (options)
+	 </text>
     <combo_box
      follows="top|left"
      height="20"
      layout="topleft"
      left_delta="15"
      name="animation_list"
-     top="345"
-     width="100" />
+     top="330"
+     width="100"/>
     <combo_box
      follows="top|left"
      height="20"
      layout="topleft"
      left_delta="0"
      name="sound_list"
-     top_delta="0"
+     top="330"
      width="100" />
     <line_editor
      follows="top|left"
@@ -281,7 +261,7 @@
      left_delta="0"
      max_length="127"
      name="chat_editor"
-     top_delta="0"
+     top="330"
      width="100" />
     <radio_group
      draw_border="false"
@@ -290,7 +270,7 @@
      layout="topleft"
      left_pad="8"
      name="animation_trigger_type"
-     top_delta="0"
+     top="330"
      width="80">
         <radio_item
          height="16"
@@ -298,7 +278,7 @@
          layout="topleft"
          left="3"
          name="start"
-         top="-51"
+         top_delta="45"
          width="80" />
         <radio_item
          height="16"
@@ -306,7 +286,7 @@
          layout="topleft"
          left_delta="0"
          name="stop"
-         top_pad="10"
+         top_pad="3"
          width="80" />
     </radio_group>
     <check_box
@@ -314,14 +294,14 @@
      height="20"
      label="until animations are done"
      layout="topleft"
-     left="16"
+     left="28"
      name="wait_anim_check"
-     top="340"
+     top="330"
      width="100" />
     <check_box
      follows="top|left"
      height="20"
-     label="time in seconds"
+     label="time in seconds:"
      layout="topleft"
      left_delta="0"
      name="wait_time_check"
@@ -331,10 +311,10 @@
      follows="top|left"
      height="20"
      layout="topleft"
-     left_pad="5"
+     left_pad="10"
      max_length="15"
      name="wait_time_editor"
-     top_delta="0"
+     top_delta="1"
      width="50" />
     <text
      type="string"
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 0569b4d515..bf5bd87ad6 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -47,8 +47,8 @@
          width="263">
         <layout_panel
          follows="top|left|right"
-          user_resize="false" 
-         auto_resize="false" 
+         user_resize="false"
+         auto_resize="false"
          layout="topleft"
          height="20"
          name="my_panel">
@@ -123,7 +123,7 @@
           layout="topleft"
           left="2"
           top_pad="0"
-          height="132" 
+          height="132"
           name="callers_panel"
           user_resize="false" 
           width="280">
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index edc25348e4..9bf9cc6c77 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
+ legacy_header_height="27"
  can_resize="true"
- height="420"
+ height="500"
  name="voice_effects"
  help_topic="voice_effects"
- title="PREVIEW VOICE MORPHING"
+ title="VOICE MORPHING"
  background_visible="true"
  follows="all"
  label="Places"
  layout="topleft"
- min_height="350"
- min_width="330"
- width="455">
+ min_height="360"
+ min_width="200"
+ width="300">
   <string name="no_voice_effect">
     (No Voice Morph)
   </string>
@@ -25,8 +25,22 @@
   <string name="new_voice_effect">
     (New!)
   </string>
+ <text
+   height="16"
+   word_wrap="true"
+   use_ellipses="true"
+   type="string"
+   follows="left|top|right"
+   layout="topleft"
+   font="SansSerifBold"
+   color="White"
+   left="10"
+   name="preview_text"
+   right="-10"
+   top="27">To Preview
+   </text>
   <text
-   height="68"
+   height="23"
    word_wrap="true"
    use_ellipses="true"
    type="string"
@@ -34,22 +48,20 @@
    layout="topleft"
    left="10"
    name="status_text"
-   right="-10"
-   top="25">
-To preview any of the Voice Morphing effects, click the Record button to record a short snippet of voice, then click any Voice Morph in the list to hear how it will sound.
-
-To reconnect to Nearby Voice simply close this window.
+   right="-5"
+   top_pad="0">
+Record a sample, then click on a voice to hear how it will sound.
   </text>
   <button
    follows="left|top"
    height="23"
-   label="Record Sample"
+   label="Record"
    layout="topleft"
    left="10"
    name="record_btn"
    tool_tip="Record a sample of your voice."
    top_pad="5"
-   width="150">
+   width="100">
     <button.commit_callback
      function="VoiceEffect.Record" />
   </button>
@@ -61,22 +73,22 @@ To reconnect to Nearby Voice simply close this window.
    left_delta="0"
    name="record_stop_btn"
    top_delta="0"
-   width="150">
+   width="100">
     <button.commit_callback
      function="VoiceEffect.Stop" />
   </button>
   <text
-   height="18"
+   height="23"
    halign="right"
    use_ellipses="true"
    type="string"
    follows="left|top|right"
    layout="topleft"
    left_pad="10"
+   top_delta="10"
    name="voice_morphing_link"
-   right="-10"
-   top_delta="5">
-    [[URL] Get Voice Morphing]
+   right="-10">
+    [[URL] Subscribe Now]
   </text>
   <scroll_list
    bottom="-10"
@@ -88,14 +100,16 @@ To reconnect to Nearby Voice simply close this window.
    name="voice_effect_list"
    right="-10"
    tool_tip="Record a sample of your voice, then click an effect to preview."
-   top="128">
+   top="95">
     <scroll_list.columns
-     label="Voice Morph"
-     name="name" relative_width="0.41"/>
+     label="Voice Name"
+     name="name"
+     relative_width="0.60" />
     <scroll_list.columns
      dynamic_width="true"
      label="Expires"
      name="expires"
-	 relative_width="0.59" />
+     relative_width="0.30" />
   </scroll_list>
+
 </floater>
diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
index f629eef475..8aeec46ba3 100644
--- a/indra/newview/skins/default/xui/en/inspect_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_object.xml
@@ -36,7 +36,6 @@ Owner [OWNER]
      top="6"
      use_ellipses="true"
      word_wrap="true"
-     value="Test Object Name That Is actually two lines and Really Long"
      width="220" />
   <text
    follows="all"
@@ -74,7 +73,6 @@ L$30,000
    use_ellipses="true"
    width="220"
    word_wrap="true">
-This is a really long description for an object being as how it is at least 80 characters in length and so but maybe more like 120 at this point. Who knows, really?
   </text>
   <!-- Overlapping buttons for all default actions.  Show "Buy" if
   for sale, "Sit" if can sit, etc. -->
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
index e084216a69..9c3151fe07 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
@@ -18,6 +18,9 @@
      name="wear_add">
         <on_click
          function="Outfit.WearAdd" />
+        <on_enable
+         function="Outfit.OnEnable"
+         parameter="wear_add" />
         <on_visible
          function="Outfit.OnVisible"
          parameter="wear_add" />
@@ -28,6 +31,9 @@
      name="take_off">
         <on_click
          function="Outfit.TakeOff" />
+        <on_enable
+         function="Outfit.OnEnable"
+         parameter="take_off" />
         <on_visible
          function="Outfit.OnVisible"
          parameter="take_off" />
@@ -44,7 +50,7 @@
     </menu_item_call>
     <menu_item_separator />
     <menu_item_call
-     label="Rename"
+     label="Rename Outfit"
      layout="topleft"
      name="rename">
         <on_click
diff --git a/indra/newview/skins/default/xui/en/menu_topinfobar.xml b/indra/newview/skins/default/xui/en/menu_topinfobar.xml
new file mode 100644
index 0000000000..cbe249ed4d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_topinfobar.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ height="201"
+ layout="topleft"
+ left="100"
+ mouse_opaque="false"
+ name="menu_topinfobar"
+ top="624"
+ visible="false"
+ width="128">
+    <menu_item_check
+         label="Show Coordinates"
+         name="Show Coordinates">
+           <on_click
+             function="ToggleControl"
+             parameter="NavBarShowCoordinates" />
+             <on_check
+             function="CheckControl"
+             parameter="NavBarShowCoordinates" />
+    </menu_item_check>
+    <menu_item_check
+      label="Show Parcel Properties"
+      name="Show Parcel Properties">
+      <on_click
+        function="ToggleControl"
+        parameter="NavBarShowParcelProperties" />
+      <on_check
+        function="CheckControl"
+        parameter="NavBarShowParcelProperties" />
+    </menu_item_check>
+    <menu_item_separator
+     name="Separator" />
+    <!-- Label of 'Landmark' item is changing in runtime, 
+    see  AddLandmarkNavBarMenu/EditLandmarkNavBarMenu in strings.xml -->
+    <menu_item_call
+     label="Landmark"
+     name="Landmark">
+        <on_click
+         function="TopInfoBar.Action"
+         parameter="landmark" />
+    </menu_item_call>
+    <menu_item_separator
+     name="Separator" />
+    <menu_item_call
+     label="Copy"
+     name="Copy">
+        <on_click
+         function="TopInfoBar.Action"
+         parameter="copy" />
+    </menu_item_call>
+</menu>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 20a2a7d954..88732fee7d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2098,7 +2098,7 @@ Would you be my friend?
    type="alertmodal">
     New outfit name:
     <form name="form">
-      <input name="new_name" type="text">
+      <input name="new_name" type="text" width="300">
         [NAME]
       </input>
       <button
@@ -6209,7 +6209,7 @@ With the following Residents:
    icon="notifytip.tga"
    name="ItemsShared"
    type="notifytip">
-Items are successfully shared.
+Items successfully shared.
   </notification>
   <notification
    icon="notifytip.tga"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 950c4a5fdb..3106ed34ff 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -225,15 +225,17 @@ left="0"
 			 tool_tip="Female"
 			 top="7"
 			 width="16" />
-		 <text_editor
-			 follows="all"
-			 height="23"
-			 left="10"
-			 layout="topleft"
-			 max_length="300"
-			 name="description"
-			 top_pad="3"
-			 width="290" />
+            <line_editor
+             follows="all"
+             height="23"
+             layout="topleft"
+             left="10"
+             max_length="300"
+             name="description"
+             prevalidate_callback="ascii"
+             text_color="black"
+             top_pad="3"
+             width="290" />
 	 </panel>
 	 <panel
 		 follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index e79ae34627..2af1a84400 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -243,7 +243,7 @@ Hover your mouse over the options for more help.
          top_pad="4"
          width="190">
 			<combo_item name="select_mature" value="Select">
-			- Select Mature -
+			- Select maturity rating -
 			</combo_item>
             <combo_box.item
              label="Moderate Content"
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 03a0c464d2..1ed73e6c15 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -106,7 +106,7 @@
             <panel
              bevel_style="none"
              follows="top|right"
-             height="38"
+             height="37"
              layout="topleft"
              left_pad="5"
              name="outfit_name_and_status"
@@ -122,18 +122,26 @@
                  top="2"
                  value="Now editing..."
                  use_ellipses="true"
-                 width="270" /> 
+                 width="245" /> 
                 <text
                  follows="bottom|left|right"
                  font="SansSerifLargeBold"
-                 height="26"
+                 height="18"
                  layout="topleft"
                  name="curr_outfit_name"
                  text_color="LtGray"
                  top_pad="2"
                  value="[Current Outfit]"
                  use_ellipses="true"
-                 width="270" /> 
+                 width="245" /> 
+                <loading_indicator
+                 follows="right|top"
+                 height="24"
+                 layout="topleft"
+                 right="-2"
+                 name="edit_outfit_loading_indicator"
+                 top="6"
+                 width="24" />
             </panel>
     </panel>
 
diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
index c575ca468c..93e79b7328 100644
--- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
@@ -6,7 +6,7 @@
  name="panel_voice_effect"
  width="200">
   <string name="no_voice_effect">
-    No Voice Morph
+    Voice Morphing Off
   </string>
   <string name="preview_voice_effects">
     Preview Voice Morphing  ▶
@@ -19,11 +19,11 @@
    follows="left|top|right"
    height="23"
    name="voice_effect"
-   tool_tip="Select a Voice Morphing effect to change your voice."
+   tool_tip="Select a Voice Morph to change your voice"
    top_pad="0"
    width="200">
     <combo_box.item
-     label="No Voice Morph"
+     label="Voice Morphing Off"
      name="no_voice_effect"
 	 top_pad="0"
      value="0" />
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index e2bd6f375e..b3bc618eec 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -159,51 +159,49 @@
 		     name="LabelCreatorName"
 		     top_delta="6"
 		     width="140">
-	        Nicole Linden
-	     </text>
-	     <button
-			 follows="top|right"
-			 height="16"
-     image_selected="Inspector_I"
-     image_unselected="Inspector_I"
-			 layout="topleft"
-			 right="-5"
-			 name="BtnCreator"
-			 top_delta="-6"
-			 width="16" />
-	     <text
-			 type="string"
-			 length="1"
-			 follows="left|top"
-			 height="23"
-			 layout="topleft"
-			   left="5"
-			 name="LabelOwnerTitle"
-			   top_pad="10"
-			 width="78">
-			    Owner:
-	     </text>
-	     <avatar_icon
-			   follows="top|left"
-			   height="20"
-			   default_icon_name="Generic_Person"
-			   layout="topleft"
-			   left_pad="0"
-			   top_delta="-6"
-			   mouse_opaque="true"
-			   width="20" />
-	     <text
-			 type="string"
-			   follows="left|right|top"
-			   font="SansSerifSmall"
-			   height="15"
-			   layout="topleft"
-			   left_pad="5"
-			 name="LabelOwnerName"
-			 top_delta="6"
-			 width="140">
-			    Thrax Linden
-	     </text>
+      </text>
+      <button
+      follows="top|right"
+      height="16"
+    image_selected="Inspector_I"
+    image_unselected="Inspector_I"
+      layout="topleft"
+      right="-5"
+      name="BtnCreator"
+      top_delta="-6"
+      width="16" />
+      <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="23"
+      layout="topleft"
+        left="5"
+      name="LabelOwnerTitle"
+        top_pad="10"
+      width="78">
+        Owner:
+      </text>
+      <avatar_icon
+        follows="top|left"
+        height="20"
+        default_icon_name="Generic_Person"
+        layout="topleft"
+        left_pad="0"
+        top_delta="-6"
+        mouse_opaque="true"
+        width="20" />
+      <text
+      type="string"
+        follows="left|right|top"
+        font="SansSerifSmall"
+        height="15"
+        layout="topleft"
+        left_pad="5"
+      name="LabelOwnerName"
+      top_delta="6"
+      width="140">
+      </text>
 	     <button
 			 follows="top|right"
 			 height="16"
@@ -236,7 +234,6 @@ top_pad="10"
 			 name="LabelAcquiredDate"
 			 top_delta="0"
 			 width="222">
-			Wed May 24 12:50:46 2006
       </text>
 	 <panel
          border="false"