Merge

17 files changed, 130 insertions, 54 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_pay_object.xml b/indra/newview/skins/default/xui/en/floater_pay_object.xml
index 455018f467..d09a0a0535 100644
--- a/indra/newview/skins/default/xui/en/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_pay_object.xml
@@ -36,7 +36,7 @@
      top_delta="3"
      name="payee_name"
      width="184">
-      Ericacita Moostopolison
+      [FIRST] [LAST]
     </text>
     <text
      type="string"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
index bbfb362337..6dc073728b 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
@@ -38,7 +38,7 @@
      width="170" />
     <button
      height="20"
-     label="Play in World"
+     label="Play Inworld"
      label_selected="Stop"
      layout="topleft"
      left="10"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_sound.xml b/indra/newview/skins/default/xui/en/floater_preview_sound.xml
index 68a78d5017..f3be8c4131 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_sound.xml
@@ -38,8 +38,8 @@
     <button
      follows="left|top"
      height="22"
-     label="Play in World"
-     label_selected="Play in World"
+     label="Play Inworld"
+     label_selected="Play Inworld"
      layout="topleft"
      name="Sound play btn"
      sound_flags="0"
diff --git a/indra/newview/skins/default/xui/en/floater_script_limits.xml b/indra/newview/skins/default/xui/en/floater_script_limits.xml
index 98c44ad1b3..6b36cdfcc5 100644
--- a/indra/newview/skins/default/xui/en/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_limits.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
+ can_resize="true"
  height="570"
  help_topic="scriptlimits"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 60c9810e95..2c9402f6cb 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -46,8 +46,11 @@
   <ui_ctrl 
     height="90"
     width="90"
+    layout="topleft"
     name="thumbnail_placeholder"
     top_pad="6"
+    follows="left|top"
+    left="10"
     />
     <text
      type="string"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index f1aa5c27c1..5630dfbe8f 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -70,7 +70,7 @@
      height="20"
      image_disabled="Tool_Zoom"
      image_disabled_selected="Tool_Zoom"
-     image_selected="Tool_Zoom"
+     image_selected="Tool_Zoom_Selected"
      image_unselected="Tool_Zoom"
      layout="topleft"
      left="10"
@@ -86,7 +86,7 @@
      height="20"
      image_disabled="Tool_Grab"
      image_disabled_selected="Tool_Grab"
-     image_selected="Tool_Grab"
+     image_selected="Tool_Grab_Selected"
      image_unselected="Tool_Grab"
      layout="topleft"
      left_pad="20"
@@ -102,7 +102,7 @@
      height="20"
      image_disabled="Tool_Face"
      image_disabled_selected="Tool_Face"
-     image_selected="Tool_Face"
+     image_selected="Tool_Face_Selected"
      image_unselected="Tool_Face"
      layout="topleft"
      left_pad="20"
@@ -118,7 +118,7 @@
      height="20"
      image_disabled="Tool_Create"
      image_disabled_selected="Tool_Create"
-     image_selected="Tool_Create"
+     image_selected="Tool_Create_Selected"
      image_unselected="Tool_Create"
      layout="topleft"
      left_pad="20"
@@ -134,7 +134,7 @@
      height="20"
      image_disabled="Tool_Dozer"
      image_disabled_selected="Tool_Dozer"
-     image_selected="Tool_Dozer"
+     image_selected="Tool_Dozer_Selected"
      image_unselected="Tool_Dozer"
      layout="topleft"
      left_pad="20"
@@ -344,7 +344,7 @@
      height="20"
      image_disabled="Object_Cube"
      image_disabled_selected="Object_Cube"
-     image_selected="Object_Cube"
+     image_selected="Object_Cube_Selected"
      image_unselected="Object_Cube"
      layout="topleft"
      left="4"
@@ -357,7 +357,7 @@
      height="20"
      image_disabled="Object_Prism"
      image_disabled_selected="Object_Prism"
-     image_selected="Object_Prism"
+     image_selected="Object_Prism_Selected"
      image_unselected="Object_Prism"
      layout="topleft"
      left_delta="26"
@@ -370,7 +370,7 @@
      height="20"
      image_disabled="Object_Pyramid"
      image_disabled_selected="Object_Pyramid"
-     image_selected="Object_Pyramid"
+     image_selected="Object_Pyramid_Selected"
      image_unselected="Object_Pyramid"
      layout="topleft"
      left_delta="26"
@@ -383,7 +383,7 @@
      height="20"
      image_disabled="Object_Tetrahedron"
      image_disabled_selected="Object_Tetrahedron"
-     image_selected="Object_Tetrahedron"
+     image_selected="Object_Tetrahedron_Selected"
      image_unselected="Object_Tetrahedron"
      layout="topleft"
      left_delta="26"
@@ -396,7 +396,7 @@
      height="20"
      image_disabled="Object_Cylinder"
      image_disabled_selected="Object_Cylinder"
-     image_selected="Object_Cylinder"
+     image_selected="Object_Cylinder_Selected"
      image_unselected="Object_Cylinder"
      layout="topleft"
      left_delta="26"
@@ -409,7 +409,7 @@
      height="20"
      image_disabled="Object_Hemi_Cylinder"
      image_disabled_selected="Object_Hemi_Cylinder"
-     image_selected="Object_Hemi_Cylinder"
+     image_selected="Object_Hemi_Cylinder_Selected"
      image_unselected="Object_Hemi_Cylinder"
      layout="topleft"
      left_delta="26"
@@ -422,7 +422,7 @@
      height="20"
      image_disabled="Object_Cone"
      image_disabled_selected="Object_Cone"
-     image_selected="Object_Cone"
+     image_selected="Object_Cone_Selected"
      image_unselected="Object_Cone"
      layout="topleft"
      left_delta="26"
@@ -435,7 +435,7 @@
      height="20"
      image_disabled="Object_Hemi_Cone"
      image_disabled_selected="Object_Hemi_Cone"
-     image_selected="Object_Hemi_Cone"
+     image_selected="Object_Hemi_Cone_Selected"
      image_unselected="Object_Hemi_Cone"
      layout="topleft"
      left_delta="26"
@@ -448,7 +448,7 @@
      height="20"
      image_disabled="Object_Sphere"
      image_disabled_selected="Object_Sphere"
-     image_selected="Object_Sphere"
+     image_selected="Object_Sphere_Selected"
      image_unselected="Object_Sphere"
      layout="topleft"
      left_delta="26"
@@ -461,7 +461,7 @@
      height="20"
      image_disabled="Object_Hemi_Sphere"
      image_disabled_selected="Object_Hemi_Sphere"
-     image_selected="Object_Hemi_Sphere"
+     image_selected="Object_Hemi_Sphere_Selected"
      image_unselected="Object_Hemi_Sphere"
      layout="topleft"
      left_delta="26"
@@ -474,7 +474,7 @@
      height="20"
      image_disabled="Object_Torus"
      image_disabled_selected="Object_Torus"
-     image_selected="Object_Torus"
+     image_selected="Object_Torus_Selected"
      image_unselected="Object_Torus"
      layout="topleft"
      left="4"
@@ -487,7 +487,7 @@
      height="20"
      image_disabled="Object_Tube"
      image_disabled_selected="Object_Tube"
-     image_selected="Object_Tube"
+     image_selected="Object_Tube_Selected"
      image_unselected="Object_Tube"
      layout="topleft"
      left_delta="26"
@@ -500,7 +500,7 @@
      height="20"
      image_disabled="Object_Ring"
      image_disabled_selected="Object_Ring"
-     image_selected="Object_Ring"
+     image_selected="Object_Ring_Selected"
      image_unselected="Object_Ring"
      layout="topleft"
      left_delta="26"
@@ -513,7 +513,7 @@
      height="20"
      image_disabled="Object_Tree"
      image_disabled_selected="Object_Tree"
-     image_selected="Object_Tree"
+     image_selected="Object_Tree_Selected"
      image_unselected="Object_Tree"
      layout="topleft"
      left_delta="26"
@@ -526,8 +526,9 @@
      height="20"
      image_disabled="Object_Grass"
      image_disabled_selected="Object_Grass"
-     image_selected="Object_Grass"
+     image_selected="Object_Grass_Selected"
      image_unselected="Object_Grass"
+     image_overlay_color="Red"
      layout="topleft"
      left_delta="26"
      name="ToolGrass"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 1e10467148..1993af6730 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -516,7 +516,7 @@
      layout="topleft" 
      name="Animation Separator" />
     <menu_item_call
-     label="Play in World"
+     label="Play Inworld"
      layout="topleft"
      name="Animation Play">
         <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index 805ffbae66..d03a7e3d41 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -78,6 +78,9 @@
      name="Pay">
         <menu_item_call.on_click
          function="Avatar.Pay" />
+        <menu_item_call.on_enable
+         function="ParticipantList.EnableItem"
+         parameter="can_pay" />
     </menu_item_call>
         <menu_item_separator
          layout="topleft" />
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index baa6c2e51f..5fe5db892a 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -139,11 +139,12 @@
      font="SansSerifSmall"
      height="15"
      layout="topleft"
-     left="0"
+     left="102"
      name="favorite"
      image_drag_indication="Accordion_ArrowOpened_Off"
      bottom="55"
-     width="590">
+     tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
+               width="590">
     <chevron_button name=">>"
                      image_unselected="TabIcon_Close_Off"
                      image_selected="TabIcon_Close_Off"
@@ -154,4 +155,15 @@
 		     top="15"
                      height="15"/>
   </favorites_bar>
+     <text
+               follows="left|top"
+         font.style="BOLD"
+               height="15"
+               layout="topleft"
+               left="10"
+               top_pad="-12"
+               name="favorites_bar_label"
+               text_color="LtGray"
+               tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
+               width="102">Favorites Bar</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 9bfd8b91d8..c4e4b9aa9b 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -17,12 +17,13 @@ background_visible="true"
      name="teleport_history_tab_title"
      value="TELEPORT HISTORY" />
     <filter_editor
+     text_pad_left="14"
      follows="left|top|right"
-     font="SansSerif"
+     font="SansSerifSmall"
      height="23"
      layout="topleft"
      left="15"
-     label="Filter Places"
+     label="Filter My Places"
      max_length="300"
      name="Filter"
      top="3"
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 22c75a595e..b496f95422 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -323,7 +323,6 @@
      follows="left|top"
      height="13"
      layout="topleft"
-     text_color="white"
      left="30"
      mouse_opaque="false"
      name="text_box3"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 27461571da..40b9b56903 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -306,7 +306,7 @@
          name="add_friend"
          tool_tip="Offer friendship to the Resident"
          top="5"
-         width="81" />
+         width="80" />
         <button
          follows="bottom|left"
          height="23"
@@ -316,7 +316,7 @@
          tool_tip="Open instant message session"
          top="5"
          left_pad="3"
-         width="45" />
+         width="39" />
         <button
          follows="bottom|left"
          height="23"
@@ -326,7 +326,7 @@
          tool_tip="Call this Resident"
          left_pad="3"
          top="5"
-         width="46" />
+         width="43" />
         <button
          enabled="false"
          follows="bottom|left"
@@ -337,7 +337,7 @@
          tool_tip="Show the Resident on the map"
          top="5"
          left_pad="3"
-         width="46" />
+         width="41" />
         <button
          follows="bottom|left"
          height="23"
@@ -347,8 +347,8 @@
          tool_tip="Offer teleport"
          left_pad="3"
          top="5"
-         width="78" />
-       <!-- <button
+         width="69" />
+        <button
          follows="bottom|right"
          height="23"
          label="▼"
@@ -357,8 +357,8 @@
          tool_tip="Pay money to or share inventory with the Resident"
          right="-1"
          top="5"
-	 left_pad="3"
-         width="23" />-->
+	 	 left_pad="3"
+         width="23" />
         </layout_panel>
       <layout_panel
          follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml
index d98f690339..629d8567d1 100644
--- a/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml
@@ -9,7 +9,44 @@
  name="script_limits_my_avatar_panel"
  top="0"
  width="480">
-    <text
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="16"
+	 layout="topleft"
+	 left="10"
+	 name="script_memory"
+	 top_pad="24"
+	 text_color="White"
+	 width="480">
+		Avatar Script Usage
+	</text>
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="16"
+	 layout="topleft"
+	 left="30"
+	 name="memory_used"
+	 top_delta="18"
+	 width="480">
+
+	</text>
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="16"
+	 layout="topleft"
+	 left="30"
+	 name="urls_used"
+	 top_delta="18"
+	 width="480">
+
+	</text>
+	<text
      type="string"
      length="1"
      follows="left|top"
@@ -17,7 +54,7 @@
      layout="topleft"
      left="10"
      name="loading_text"
-     top="10"
+     top="80"
      text_color="EmphasisColor"
      width="480">
         Loading...
@@ -25,12 +62,12 @@
     <scroll_list
      draw_heading="true"
      follows="all"
-     height="500"
+     height="415"
      layout="topleft"
      left_delta="0"
      multi_select="true"
      name="scripts_list"
-     top_delta="17"
+     top="100"
      width="460">
         <scroll_list.columns
          label="Size (kb)"
diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
index 0fa3c1cf2e..9dff00fa0b 100644
--- a/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
@@ -33,7 +33,7 @@
 	 top_delta="18"
 	 visible="true"
 	 width="480">
-		Parcels Owned:
+	 
 	</text>
 	<text
 	 type="string"
@@ -45,7 +45,19 @@
 	 name="memory_used"
 	 top_delta="18"
 	 width="480">
-		Memory used:
+	</text>
+	
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="16"
+	 layout="topleft"
+	 left="30"
+	 name="urls_used"
+	 top_delta="18"
+	 width="480">
+	 
 	</text>
 	<text
      type="string"
@@ -55,7 +67,7 @@
      layout="topleft"
      left="10"
      name="loading_text"
-     top_delta="32"
+     top_delta="12"
      text_color="EmphasisColor"
      width="480">
         Loading...
@@ -73,7 +85,11 @@
         <scroll_list.columns
          label="Size (kb)"
          name="size"
-         width="70" />
+         width="72" />
+        <scroll_list.columns
+         label="URLs"
+         name="urls"
+         width="48" />
         <scroll_list.columns
          label="Object Name"
          name="name"
@@ -83,11 +99,13 @@
          name="owner"
          width="100" />
         <scroll_list.columns
-         label="Parcel / Location"
-         name="location"
+         label="Parcel"
+         name="parcel"
          width="130" />
-<!--		<scroll_list.commit_callback
-          function="TopObjects.CommitObjectsList" />-->
+        <scroll_list.columns
+         label="Location"
+         name="location"
+         width="80" />
     </scroll_list>
     <button
      follows="bottom|left"
@@ -102,8 +120,8 @@
     <button
      follows="bottom|right"
      height="19"
-	 visible="false"
      label="Highlight"
+	 visible="false"
      layout="bottomright"
      left="370"
      name="highlight_btn"
@@ -112,8 +130,8 @@
     <button
      follows="bottom|right"
      height="19"
-	 visible="false"
      label="Return"
+	 visible="false"
      layout="bottomright"
      name="return_btn"
      top="34"
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 74f97dca4e..d2c9e56bc3 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -85,7 +85,7 @@
      left="45"
      name="where"
      text_color="LtGray_50"
-     value="(In World)"
+     value="(inworld)"
      width="150" />
 	<panel
          follows="all"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b378944e48..b4a12cfb32 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2051,6 +2051,7 @@ this texture in your inventory
 	<string name="ScriptLimitsURLsUsed">URLs used: [COUNT] out of [MAX]; [AVAILABLE] available</string>
 	<string name="ScriptLimitsURLsUsedSimple">URLs used: [COUNT]</string>
 	<string name="ScriptLimitsRequestError">Error requesting information</string>
+	<string name="ScriptLimitsRequestNoParcelSelected">No Parcel Selected</string>
 	<string name="ScriptLimitsRequestWrongRegion">Error: script information is only available in your current region</string>
 	<string name="ScriptLimitsRequestWaiting">Retrieving information...</string>
 	<string name="ScriptLimitsRequestDontOwnParcel">You do not have permission to examine this parcel</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
index 48baa2812d..1228f6be3d 100644
--- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <filter_editor
   clear_button_visible="true"
-  search_button_visible="true"
+  search_button_visible="false"
   text_pad_left="7"
   select_on_focus="true"
   text_tentative_color="TextFgTentativeColor"