Merge viewer-release 6.2.2

15 files changed, 224 insertions, 137 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index b4577f54e6..431c33a339 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -226,6 +226,7 @@
      layout="topleft"
      top_pad="0"
      name="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="92" />
         <text
      type="string"
@@ -247,6 +248,7 @@
      layout="topleft"
      top_pad="0"
      name="everyone_copy"
+     tool_tip="Anyone can take a copy of the object. Object and all of its contents must be copy and transfer permissive"
      width="92" />
     <text
      type="string"
@@ -267,6 +269,7 @@
      label="Modify"
      layout="topleft"
      name="next_owner_modify"
+     tool_tip="Next owner can edit properties like item name or scale of this object."
      top_pad="0"
      width="92" />
     <check_box
@@ -276,6 +279,7 @@
      layout="topleft"
      top_pad="0"
      name="next_owner_copy"
+     tool_tip="Next owner can make unlimited copies of this object. Copies maintain creator information, and can never be more permissive than the item being copied."
      width="92">
       <check_box.commit_callback
        function="BulkPermission.CommitCopy"/>
@@ -289,7 +293,7 @@
      label="Transfer"
      layout="topleft"
      name="next_owner_transfer"
-     tool_tip="Next owner can give away or resell this object"
+     tool_tip="Next owner can give away or resell this object."
      width="92" />
     <scroll_list
      enabled="false"
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 3db431de1b..5a86eb06fb 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -73,35 +73,6 @@
           prevalidate_callback="ascii"
           top_pad="5"
           width="290" />
-        <text
-          follows="left|top"
-          height="15"
-          layout="topleft"
-          left_pad="15"
-          name="model_category_label"
-          text_color="White"
-          top="0"
-          width="200">
-          This model represents...
-        </text>
-        <combo_box
-          follows="left|top"
-          height="23"
-          left_pad="10"
-          name="model_category_combo"
-          top_pad="10"
-          width="200">
-        <combo_box.drop_down_button
-          label_color="White"/>
-          <combo_item name="Choose one" label="Choose One..." value="MUT_Unspecified"/>
-          <combo_item name="Avatar shape" label="Avatar shape" value="MUT_AvatarShape"/>
-          <combo_item name="Avatar attachment" label="Avatar attachment" value="MUT_AvatarAttachment"/>
-          <combo_item name="Moving object (vehicle, animal)" label="Moving object (vehicle, animal)" value="MUT_MovingObject"/>
-          <combo_item name="Building Component" label="Building Component" value="MUT_BuildingComponent"/>
-          <combo_item name="Large, non moving etc" label="Large, non moving etc" value="MUT_LargeStationary"/>
-          <combo_item name="Smaller, non-moving etc" label="Smaller, non-moving etc" value="MUT_SmallStationary"/>
-          <combo_item name="Not really any of these" label="Not really any of these" value="MUT_Other"/>
-         </combo_box>
     </panel>
     <tab_container
       follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/floater_my_scripts.xml b/indra/newview/skins/default/xui/en/floater_my_scripts.xml
new file mode 100644
index 0000000000..3b0b6723c7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_my_scripts.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="570"
+ help_topic="scriptlimits"
+ layout="topleft"
+ name="myscripts"
+ save_rect="true"
+ title="My Scripts"
+ min_width="620"
+ width="620">
+  <panel
+   filename="panel_script_limits_my_avatar.xml"
+   follows="all"
+   bottom="555"
+   layout="topleft"
+   left="3"
+   right="-2"
+   name="script_limits_my_avatar_panel"
+   top="20"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 845c1efe4d..0e62d50072 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -3,7 +3,7 @@
  legacy_header_height="18"
  positioning="centered"
  default_tab_group="1"
- height="512"
+ height="530"
  layout="topleft"
  name="Preferences"
  help_topic="preferences"
@@ -25,7 +25,7 @@ https://accounts.secondlife.com/change_email/
      layout="topleft"
      right="-105"
      name="OK"
-     top="473"
+     top="492"
      width="90">
         <button.commit_callback
          function="Pref.OK" />
@@ -43,6 +43,42 @@ https://accounts.secondlife.com/change_email/
         <button.commit_callback
          function="Pref.Cancel" />
     </button>
+
+    <panel
+     name="search_panel"
+     layout="topleft"
+     follows="left|top|right"
+     left="4"
+     right="-4"
+     top="21"
+     height="18"
+     tab_group="2">
+        <search_editor
+         clear_button_visible="true"
+         follows="left|top|right"
+         height="18"
+         label="Search Settings"
+         layout="topleft"
+         left="0"
+         max_length_bytes="255"
+         name="search_prefs_edit"
+         right="-1"
+         text_pad_left="6"
+         tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the setting's name or comment."
+         top="0">
+         <search_editor.commit_callback
+          function="UpdateFilter" />
+         <search_editor.clear_button
+          rect.height="18"
+          rect.width="18"
+          rect.bottom="-1" />
+         <search_editor.search_button
+          rect.height="12"
+          rect.width="12"
+          rect.bottom="-1" />
+        </search_editor>
+    </panel>
+
     <tab_container
      follows="all"
      halign="left"
@@ -54,7 +90,7 @@ https://accounts.secondlife.com/change_email/
      tab_position="left"
      tab_width="140"
      tab_padding_right="0"
-     top="21"
+     top="40"
      width="658">
         <panel
 	 class="panel_preference"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index d9a15fed9e..0abee2ff80 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -915,7 +915,8 @@
              name="Object Name"
              select_on_focus="true"
              top_delta="0"
-             width="170" />
+             width="170"
+             tool_tip="The name is limited to 63 characters. Longer prim names are cut short. Names can only consist of printable characters found in the ASCII-7 (non-extended) character set, with the exception of the vertical bar/pipe &apos;|&apos;." />
             <text
              follows="left|top"
              height="10"
@@ -933,7 +934,8 @@
              name="Object Description"
              select_on_focus="true"
              top_delta="0"
-             width="170" />
+             width="170"
+             tool_tip="When people have &apos;Hover Tips on All Objects&apos; selected in the viewer's settings, they'll see the object description pop-up for any object under their mouse pointer. The prim description is limited to 127 bytes any string longer then that will be truncated." />
             <text
              type="string"
              left="10"
@@ -1090,7 +1092,8 @@
              layout="topleft"
              name="clickaction"
              width="130"
-             left_pad="10">
+             left_pad="10"
+             tool_tip="A click action enables you to interact with an object with a single left click. Each click action has a special cursor indicating what it does. Some click actions have requirements to function. For example Touch and Pay require scripts" >
                 <combo_box.item
                  label="Touch  (default)"
                  name="Touch/grab(default)"
@@ -1126,7 +1129,8 @@
              layout="topleft"
              name="checkbox for sale"
              left="7"
-             width="97" />
+             width="97"
+             tool_tip="Lets people buy this object, its content or it copy inworld for specified price." />
   <!-- NEW PRICE SPINNER
 Objects are allowed to be for sale for L$0 to invoke buy UI behavior
 even though the user gets a free copy.
@@ -1144,7 +1148,8 @@ even though the user gets a free copy.
       width="85"
       min_val="0"
       height="20"
-      max_val="999999999" />
+      max_val="999999999"
+      tool_tip="Object cost." />
   <!-- NEW SALE TYPE COMBO BOX -->
       <combo_box
             left_pad="8"
@@ -1157,7 +1162,8 @@ even though the user gets a free copy.
             max_chars="20"
             mouse_opaque="true"
             name="sale type"
-            width="89">
+            width="89"
+            tool_tip="Select whether purchaser will receive a copy, copy of the content or item itself." >
         <combo_box.item
            name="Copy"
            label="Copy"
@@ -1219,6 +1225,7 @@ even though the user gets a free copy.
              label="Move"
              layout="topleft"
              name="checkbox allow everyone move"
+             tool_tip="Anyone can move the object."
              left="10"
              width="85" />
             <check_box
@@ -1227,6 +1234,7 @@ even though the user gets a free copy.
              layout="topleft"
              left_pad="0"
              name="checkbox allow everyone copy"
+             tool_tip="Anyone can take a copy of the object. Object and all of its contents must be copy and transfer permissive."
              width="90" />
             <text
                type="string"
@@ -1244,6 +1252,7 @@ even though the user gets a free copy.
              left="10"
              height="10"
              name="checkbox next owner can modify"
+             tool_tip="Next owner can edit properties like item name or scale of this object."
              width="85" />
             <check_box
              follows="left|top|right"
@@ -1252,6 +1261,7 @@ even though the user gets a free copy.
              layout="topleft"
              left_pad="0"
              name="checkbox next owner can copy"
+             tool_tip="Next owner can make unlimited copies of this object. Copies maintain creator information, and can never be more permissive than the item being copied."
              width="80" />
             <check_box
              follows="left|top|right"
@@ -1261,7 +1271,7 @@ even though the user gets a free copy.
              name="checkbox next owner can transfer"
              left_pad="0"
              top_delta="0"
-             tool_tip="Next owner can give away or resell this object"
+             tool_tip="Next owner can give away or resell this object."
              width="100" />
 <!-- *NOTE: These "B/O/G/E/N/F fields may overlap "perm_modify" above, 
      but that's OK, this is used only for debugging. -->
diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml
index 36ceddd305..b82fe43e74 100644
--- a/indra/newview/skins/default/xui/en/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="372"
+ height="350"
  layout="topleft"
  min_height="300"
  min_width="450"
@@ -16,7 +16,7 @@
     </floater.string>
     <floater.string
      name="top_scripts_text">
-        [COUNT] scripts taking a total of [TIME] ms
+        [COUNT] scripts taking a total of [TIME] ms and using [MEMORY] KB
     </floater.string>
     <floater.string
      name="scripts_score_label">
@@ -273,28 +273,4 @@
       <button.commit_callback
           function="TopObjects.ReturnAll" />
     </button>
-    <button
-     follows="bottom|left"
-     height="23"
-     label="Disable Selected"
-     layout="topleft"
-
-     left="112"
-     name="disable_selected_btn"
-     width="130">
-      <button.commit_callback
-          function="TopObjects.DisableSelected" />
-    </button>
-    <button
-     follows="bottom|left"
-     height="23"
-     label="Disable All"
-     layout="topleft"
-     left_pad="10"
-     name="disable_all_btn"
-     top_delta="0"
-     width="130">
-      <button.commit_callback
-          function="TopObjects.DisableAll" />
-    </button>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 82027d9e7c..8b1d50e58f 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -9,6 +9,7 @@
       <file>gulim.ttc</file>
       <file>simhei.ttf</file>
       <file>ArialUni.ttf</file>
+      <file>msyh.ttc</file>
     </os>
     <os name="Mac">
       <file>ヒラギノ角ゴシック W3.ttc</file>  
@@ -19,6 +20,7 @@
       <file>AppleGothic.ttf</file>
       <file>AppleSDGothicNeo-Regular.otf</file>
       <file>华文细黑.ttf</file>
+      <file>PingFang.ttc</file>
     </os>
   </font>
 
diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml
index 51779e4bfd..d418fc38e3 100644
--- a/indra/newview/skins/default/xui/en/language_settings.xml
+++ b/indra/newview/skins/default/xui/en/language_settings.xml
@@ -42,6 +42,7 @@
 	<string name="TimeWeek">wkday,datetime,slt</string>
 	<string name="TimeAMPM">ampm,datetime,slt</string>
 	<string name="TimeHour12">hour12,datetime,slt</string>	
+	<string name="TimeTimezone">timezone,datetime,slt</string>
 
 	<string name="LTimeMthNum">mthnum,datetime,local</string>
 	<string name="LTimeWeek">wkday,datetime,local</string>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2eab312ecd..8aa2c8d931 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -73,6 +73,13 @@
           function="Floater.ToggleOrBringToFront"
           parameter="experiences"/>
       </menu_item_call>
+      <menu_item_call
+        label="My Scripts..."
+        name="MyScripts">
+        <menu_item_call.on_click
+          function="Floater.ToggleOrBringToFront"
+          parameter="my_scripts"/>
+      </menu_item_call>
       <menu_item_separator/>
       <menu_item_call
        label="Camera Controls..."
@@ -750,8 +757,7 @@
 	     	 	 function="World.EnvSettings"
                  parameter="editor"/>
 	     	</menu_item_call>
-	     	
-	     	<menu_item_separator/>
+	     		     	<menu_item_separator/>
 
 	     	<menu
 	     	 name="Water Presets"
@@ -790,8 +796,7 @@
 	     	 	 	parameter="edit_sky"/>
 	     	 	</menu_item_call>
 	     	</menu>
-	     	
-	     	<menu
+	     		     	<menu
 	     	 name="Day Presets"
 	     	 label="Day Presets">
 	     	 	<menu_item_call
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index fc3556ddc0..a80bfae2a7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1845,7 +1845,7 @@ You are not allowed to terraform parcel [PARCEL].
    name="CannotCopyWarning"
    type="alertmodal">
 You do not have permission to copy the following items:
-[ITEMS]
+&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
 and will lose it from your inventory if you give it away. Do you really want to offer these items?
     <tag>confirm</tag>
     <usetemplate
@@ -7881,28 +7881,6 @@ Do not allow access if you do not fully understand why it wants access to your a
     </footer>
   </notification>
 
-  <notification
-   icon="notify.tga"
-	 name="UnknownScriptQuestion"
-	 persist="false"
-	 type="notify">
-The runtime script permission requested by &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, isn&apos;t recognized by the viewer and can&apos;t be granted.
-
-To grant this permission please update your viewer to the latest version from [DOWNLOADURL].
-		<tag>confirm</tag>
-		<form name="form">
-			<button
-			 default="true"
-			 index="1"
-			 name="Deny"
-			 text="Ok"/>
-			<button
-			 index="2"
-			 name="Mute"
-			 text="Block"/>
-		</form>
-	</notification>
-
 	<notification
    icon="notify.tga"
    name="ScriptDialog"
@@ -9594,7 +9572,7 @@ You Can't create trees and grass on land you don't own.
    name="NoCopyPermsNoObject"
    type="notify">
    <tag>fail</tag>
-Copy failed because you lack permission to copy the object '[OBJ_NAME]'.
+Copy failed because you lack permission to copy the object &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt;.
   </notification>
 
   <notification
@@ -9602,7 +9580,7 @@ Copy failed because you lack permission to copy the object '[OBJ_NAME]'.
    name="NoTransPermsNoObject"
    type="notify">
    <tag>fail</tag>
-Copy failed because the object '[OBJ_NAME]' cannot be transferred to you.
+Copy failed because the object &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; cannot be transferred to you.
   </notification>
 
   <notification
@@ -9610,7 +9588,7 @@ Copy failed because the object '[OBJ_NAME]' cannot be transferred to you.
    name="AddToNavMeshNoCopy"
    type="notify">
    <tag>fail</tag>
-Copy failed because the object '[OBJ_NAME]' contributes to navmesh.
+Copy failed because the object &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; contributes to navmesh.
   </notification>
 
   <notification
@@ -9734,7 +9712,7 @@ Save Back To Inventory has been disabled.
    name="NoExistNoSaveToContents"
    type="notify">
    <tag>fail</tag>
-Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed from no longer exists.
+Cannot save &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; to object contents because the object it was rezzed from no longer exists.
   </notification>
 
   <notification
@@ -9742,7 +9720,7 @@ Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed fro
    name="NoModNoSaveToContents"
    type="notify">
    <tag>fail</tag>
-Cannot save '[OBJ_NAME]' to object contents because you do not have permission to modify the object '[DEST_NAME]'.
+Cannot save &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; to object contents because you do not have permission to modify the object &lt;nolink&gt;'[DEST_NAME]'&lt;/nolink&gt;.
   </notification>
 
   <notification
@@ -9750,7 +9728,7 @@ Cannot save '[OBJ_NAME]' to object contents because you do not have permission t
    name="NoSaveBackToInvDisabled"
    type="notify">
    <tag>fail</tag>
-Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled.
+Cannot save &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; back to inventory -- this operation has been disabled.
   </notification>
 
   <notification
@@ -9758,7 +9736,7 @@ Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled.
    name="NoCopyNoSelCopy"
    type="notify">
    <tag>fail</tag>
-You cannot copy your selection because you do not have permission to copy the object '[OBJ_NAME]'.
+You cannot copy your selection because you do not have permission to copy the object &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt;.
   </notification>
 
   <notification
@@ -9766,7 +9744,7 @@ You cannot copy your selection because you do not have permission to copy the ob
    name="NoTransNoSelCopy"
    type="notify">
    <tag>fail</tag>
-You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
+You cannot copy your selection because the object &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; is not transferrable.
   </notification>
 
   <notification
@@ -9774,7 +9752,7 @@ You cannot copy your selection because the object '[OBJ_NAME]' is not transferra
    name="NoTransNoCopy"
    type="notify">
    <tag>fail</tag>
-You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
+You cannot copy your selection because the object &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; is not transferrable.
   </notification>
 
   <notification
@@ -9782,7 +9760,7 @@ You cannot copy your selection because the object '[OBJ_NAME]' is not transferra
    name="NoPermsNoRemoval"
    type="notify">
    <tag>fail</tag>
-Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permissions system.
+Removal of the object &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; from the simulator is disallowed by the permissions system.
   </notification>
 
   <notification
@@ -9790,7 +9768,7 @@ Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permi
    name="NoModNoSaveSelection"
    type="notify">
    <tag>fail</tag>
-Cannot save your selection because you do not have permission to modify the object '[OBJ_NAME]'.
+Cannot save your selection because you do not have permission to modify the object &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt;.
   </notification>
 
   <notification
@@ -9798,7 +9776,7 @@ Cannot save your selection because you do not have permission to modify the obje
    name="NoCopyNoSaveSelection"
    type="notify">
    <tag>fail</tag>
-Cannot save your selection because the object '[OBJ_NAME]' is not copyable.
+Cannot save your selection because the object &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; is not copyable.
   </notification>
 
   <notification
@@ -9806,7 +9784,7 @@ Cannot save your selection because the object '[OBJ_NAME]' is not copyable.
    name="NoModNoTaking"
    type="notify">
    <tag>fail</tag>
-You cannot take your selection because you do not have permission to modify the object '[OBJ_NAME]'.
+You cannot take your selection because you do not have permission to modify the object &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt;.
   </notification>
 
   <notification
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 9da044ab64..335d7caa51 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -32,11 +32,6 @@
      width="200">
         <combo_box.item
          enabled="true"
-         label="System default"
-         name="System Default Language"
-         value="default" />
-        <combo_box.item
-         enabled="true"
          label="English"
          name="English"
          value="en" />
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 998f1ce599..52bcce01f7 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -34,6 +34,46 @@
         L$ [AMT]
     </panel.string>
   <panel
+	 height="18"
+	 left="-458"
+	 top="0"
+	 width="120"
+	 follows="right|top"
+	 name="menu_search_panel"
+	 background_opaque="true"
+	 background_visible="true"
+	 bg_opaque_color="MouseGray">
+		<search_editor
+		 clear_button_visible="true"
+		 follows="left|top"
+		 height="18"
+		 label="Search Menus"
+		 layout="topleft"
+		 left="0"
+		 max_length_bytes="255"
+		 name="search_menu_edit"
+		 right="-1"
+		 text_pad_left="6"
+		 tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the menu."
+		 top="0">
+			<search_button 
+			 top_pad="4"
+			 left_pad="4" 
+			 width="12"
+			 height="12" 
+			 image_unselected="Search"
+			 image_selected="Search"/>
+			<clear_button
+			 bottom="2"
+			 height="12"
+			 image_unselected="Icon_Close_Foreground"
+			 image_selected="Icon_Close_Press"
+			 pad_right="4"
+			 pad_left="4"
+			 width="12"/>
+		</search_editor>
+  </panel>
+  <panel
     height="18"
     left="-416"
     width="185"
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 fd14b13ed6..acb6f5b42a 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -130,7 +130,8 @@
         max_length_bytes="63"
         name="LabelItemName"
         top_delta="0"
-        width="210" />
+        width="210"
+        tool_tip="The name is limited to 63 characters. Longer prim names are cut short. Names can only consist of printable characters found in the ASCII-7 (non-extended) character set, with the exception of the vertical bar/pipe &apos;|&apos;." />
       <text
         type="string"
         length="1"
@@ -153,7 +154,8 @@
         max_length_bytes="127"
         name="LabelItemDesc"
         top_delta="-5"
-        width="210" />
+        width="210"
+        tool_tip="When people have &apos;Hover Tips on All Objects&apos; selected in the viewer's settings, they'll see the object description pop-up for any object under their mouse pointer. The prim description is limited to 127 bytes any string longer then that will be truncated." />
       <text
         type="string"
         length="1"
@@ -351,6 +353,7 @@
           layout="topleft"
           left_pad="0"
           name="CheckEveryoneCopy"
+          tool_tip="Anyone can take a copy of the object . Object and all of its contents must be copy and transfer permissive."
           top_delta="-2"
           width="150" />
         <text
@@ -394,6 +397,7 @@
           left="20"
           top_pad="0"
           name="CheckNextOwnerModify"
+          tool_tip="Next owner can edit properties like item name or scale of this object."
           width="90" />
         <check_box
           height="18"
@@ -401,6 +405,7 @@
           layout="topleft"
           left_pad="0"
           name="CheckNextOwnerCopy"
+          tool_tip="Next owner can make unlimited copies of this object. Copies maintain creator information, and can never be more permissive than the item being copied."
           width="90" />
         <check_box
           height="18"
@@ -408,7 +413,7 @@
           layout="topleft"
           left_pad="0"
           name="CheckNextOwnerTransfer"
-          tool_tip="Next owner can give away or resell this object"
+          tool_tip="Next owner can give away or resell this object."
           width="106" />
       </panel>
       <check_box
@@ -418,14 +423,16 @@
         left="20"
         name="CheckPurchase"
         top_pad="20"
-        width="100" />
+        width="100"
+        tool_tip="Lets people buy this object, its content or it copy inworld for specified price." />
       <combo_box
         height="23"
         left_pad="0"
         layout="topleft"
         follows="left|top"
         name="ComboBoxSaleType"
-        width="170">
+        width="170"
+        tool_tip="Select whether purchaser will receive a copy, copy of the content or item itself." >
         <combo_box.item
              name="Copy"
              label="Copy"
@@ -452,7 +459,8 @@
         min_val="0"
         height="23"
         max_val="999999999"
-        top_pad="10"/>
+        top_pad="10"
+        tool_tip="Object cost." />
     </panel>
 
   </scroll_container>
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 efedb9559e..8a3e18707f 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -130,7 +130,8 @@
 		     max_length_bytes="63"
              name="Object Name"
 	    	 top_delta="0"
-		     width="225" />
+		     width="225"
+             tool_tip="The name is limited to 63 characters. Longer prim names are cut short. Names can only consist of printable characters found in the ASCII-7 (non-extended) character set, with the exception of the vertical bar/pipe &apos;|&apos;." />
 	    <text
 	    type="string"
 	    length="1"
@@ -154,7 +155,8 @@
     		 left_delta="78"
 		     max_length_bytes="127"
 	    	 top_delta="-5"
-	    	 width="225"/>
+	    	 width="225"
+             tool_tip="When people have &apos;Hover Tips on All Objects&apos; selected in the viewer's settings, they'll see the object description pop-up for any object under their mouse pointer. The prim description is limited to 127 bytes any string longer then that will be truncated." />
 	    <text
 		     type="string"
 		     length="1"
@@ -271,23 +273,24 @@
              layout="topleft"
              name="clickaction"
              width="168"
-             left="81">
+             left="81"
+             tool_tip="A click action enables you to interact with an object with a single left click. Each click action has a special cursor indicating what it does. Some click actions have requirements to function. For example Touch and Pay require scripts" >
                 <combo_box.item
                  label="Touch  (default)"
                  name="Touch/grab(default)"
-          value="Touch" />
+                 value="Touch" />
                 <combo_box.item
                  label="Sit on object"
                  name="Sitonobject"
-          value="Sit" />
+                 value="Sit" />
                 <combo_box.item
                  label="Buy object"
                  name="Buyobject"
-          value="Buy" />
+                 value="Buy" />
                 <combo_box.item
                  label="Pay object"
                  name="Payobject"
-          value="Pay" />
+                 value="Pay" />
                 <combo_box.item
                  label="Open"
                  name="Open"
@@ -344,6 +347,7 @@
 			 layout="topleft"
 			 left_pad="0"
              name="checkbox allow everyone copy"
+             tool_tip="Anyone can take a copy of the object. Object and all of its contents must be copy and transfer permissive."
 			 top_delta="-2"
 			 width="90" />
 	    <check_box
@@ -351,6 +355,7 @@
              label="Move"
              layout="topleft"
              name="checkbox allow everyone move"
+             tool_tip="Anyone can move the object."
 			 left_pad="0"
              width="150" />
 	       	<text
@@ -394,6 +399,7 @@
 			 left="20"
 			 top_pad="0"
              name="checkbox next owner can modify"
+             tool_tip="Next owner can edit properties like item name or scale of this object."
 			 width="90" />
 	    <check_box
 			 height="18"
@@ -401,6 +407,7 @@
 			 layout="topleft"
 			 left_pad="0"
              name="checkbox next owner can copy"
+             tool_tip="Next owner can make unlimited copies of this object. Copies maintain creator information, and can never be more permissive than the item being copied."
 			 width="90" />
 	    <check_box
 			 height="18"
@@ -418,14 +425,16 @@
 			 left="20"
              name="checkbox for sale"
 			 top_pad="10"
-			 width="100" />
+			 width="100"
+			 tool_tip="Lets people buy this object, its content or it copy inworld for specified price." />
 		<combo_box
 			 height="23"
 			 left_pad="0"
 			 layout="topleft"
 			 follows="left|top"
-            name="sale type"
-			 width="170">
+             name="sale type"
+			 width="170"
+			 tool_tip="Select whether purchaser will receive a copy, copy of the content or item itself.">
         <combo_box.item
            name="Copy"
            label="Copy"
@@ -452,7 +461,8 @@
         width="150"
         min_val="1"
         height="20"
-        max_val="999999999" />
+        max_val="999999999"
+        tool_tip="Object cost." />
       <check_box
 	   height="20"
 	   width="110"
@@ -569,7 +579,8 @@
 		     left="5"
 		     name="open_btn"
 		     top="0"
-		     width="73" />
+		     width="73"
+		     tool_tip="Open to view the Object Contents." />
 	    <button
 		     follows="bottom|left"
 		     height="23"
@@ -578,7 +589,8 @@
 		     left_pad="5"
 		     name="pay_btn"
 		     top="0"
-		     width="73" />
+		     width="73"
+		     tool_tip="Open Pay Window. Object must have pay script for this to work." />
 	    <button
 		     follows="bottom|left"
 		     height="23"
@@ -587,7 +599,8 @@
 		     left_pad="5"
 		     name="buy_btn"
 		     top="0"
-		     width="73" />
+		     width="73"
+		     tool_tip="Open Buy Window. Requires the object to be set for sale." />
         <button
 		     follows="bottom|left"
 		     height="23"
@@ -596,7 +609,8 @@
 		     left_pad="5"
 		     name="details_btn"
 		     top="0"
-		     width="74" />
+		     width="74"
+		     tool_tip="Open Inspect Object Window." />
 
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 12edeb3ce9..2a1910118c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2679,14 +2679,14 @@ If you continue to receive this message, please contact Second Life support for
 
 	<string name="SITTING_ON">Sitting On</string>
 	<string name="ATTACH_CHEST">Chest</string>
-	<string name="ATTACH_HEAD">Head</string>
+	<string name="ATTACH_HEAD">Skull</string>
 	<string name="ATTACH_LSHOULDER">Left Shoulder</string>
 	<string name="ATTACH_RSHOULDER">Right Shoulder</string>
 	<string name="ATTACH_LHAND">Left Hand</string>
 	<string name="ATTACH_RHAND">Right Hand</string>
 	<string name="ATTACH_LFOOT">Left Foot</string>
 	<string name="ATTACH_RFOOT">Right Foot</string>
-	<string name="ATTACH_BACK">Back</string>
+	<string name="ATTACH_BACK">Spine</string>
 	<string name="ATTACH_PELVIS">Pelvis</string>
 	<string name="ATTACH_MOUTH">Mouth</string>
 	<string name="ATTACH_CHIN">Chin</string>
@@ -2696,16 +2696,16 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="ATTACH_REYE">Right Eye</string>
 	<string name="ATTACH_NOSE">Nose</string>
 	<string name="ATTACH_RUARM">Right Upper Arm</string>
-	<string name="ATTACH_RLARM">Right Lower Arm</string>
+	<string name="ATTACH_RLARM">Right Forearm</string>
 	<string name="ATTACH_LUARM">Left Upper Arm</string>
-	<string name="ATTACH_LLARM">Left Lower Arm</string>
+	<string name="ATTACH_LLARM">Left Forearm</string>
 	<string name="ATTACH_RHIP">Right Hip</string>
 	<string name="ATTACH_RULEG">Right Upper Leg</string>
 	<string name="ATTACH_RLLEG">Right Lower Leg</string>
 	<string name="ATTACH_LHIP">Left Hip</string>
 	<string name="ATTACH_LULEG">Left Upper Leg</string>
 	<string name="ATTACH_LLLEG">Left Lower Leg</string>
-	<string name="ATTACH_BELLY">Belly</string>
+	<string name="ATTACH_BELLY">Stomach</string>
 	<string name="ATTACH_LEFT_PEC">Left Pec</string>
 	<string name="ATTACH_RIGHT_PEC">Right Pec</string>
 	<string name="ATTACH_HUD_CENTER_2">HUD Center 2</string>
@@ -4256,4 +4256,29 @@ Try enclosing path to the editor with double quotes.
       The physics shape does not have correct version. Set the correct version for the physics model.
   </string>
 
+  <!-- CURL error messages -->
+  <string name="couldnt_resolve_host">
+DNS could not resolve the host name([HOSTNAME]).
+Please verify that you can connect to the www.secondlife.com
+web site.  If you can, but continue to receive this error,
+please go to the support section and report this problem.
+  </string>
+  <string name="ssl_peer_certificate">
+The login server couldn't verify itself via SSL.
+If you continue to receive this error, please go
+to the Support section of the SecondLife.com web site
+and report the problem.
+  </string>
+  <string name="ssl_connect_error">
+Often this means that your computer's clock is set incorrectly.
+Please go to Control Panels and make sure the time and date
+are set correctly.
+Also check that your network and firewall are set up correctly.
+If you continue to receive this error, please go
+to the Support section of the SecondLife.com web site
+and report the problem.
+
+[https://community.secondlife.com/knowledgebase/english/error-messages-r520/#Section__3 Knowledge Base]
+  </string>
+
 </strings>