merge

12 files changed, 34 insertions, 20 deletions

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index acb3262093..cdbeed111e 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -648,7 +648,7 @@
      reference="LtGray" />
     <color
      name="TextFgTentativeColor"
-	 value="0 0 0 .33" />
+     value="0.4 0.4 0.4 1" />
     <color
      name="TimeTextColor"
      reference="LtGray" />
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index e7579ec653..607df10048 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -57,6 +57,9 @@ with the same filename but different name
   <texture name="Arrow_Small_Left" file_name="widgets/Arrow_Small_Left.png" preload="true" />
   <texture name="Arrow_Small_Right" file_name="widgets/Arrow_Small_Right.png" preload="true" />
 
+  <texture name="Arrow_Down" file_name="widgets/Arrow_Down.png"	preload="true" />
+  <texture name="Arrow_Up" file_name="widgets/Arrow_Up.png" preload="true" />
+
   <texture name="AudioMute_Off" file_name="icons/AudioMute_Off.png" preload="false" />
   <texture name="AudioMute_Over" file_name="icons/AudioMute_Over.png" preload="false" />
   <texture name="AudioMute_Press" file_name="icons/AudioMute_Press.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
index 19f5155f88..b24c745bdd 100644
--- a/indra/newview/skins/default/xui/en/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="150"
+ height="170"
  layout="topleft"
  name="floater_lagmeter"
  help_topic="floater_lagmeter"
@@ -328,7 +328,7 @@
      left="10"
      name="minimize"
 	 tool_tip="Toggle floater size"
-     top_delta="4"
+     top_delta="24"
      width="40">
         <button.commit_callback
          function="LagMeter.ClickShrink" />
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 9c11a88c34..e632b67d11 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -62,7 +62,7 @@
      left="4"
      layout="topleft"
      name="Show My Location"
-     tool_tip="Center map on your avatar&apos;s location"
+     tool_tip="Center map on my avatar&apos;s location"
      top="6"
      width="24" >
 		<button.commit_callback
@@ -235,7 +235,7 @@
      left="136"
      top="6"
      name="Go Home"
-     tool_tip="Teleport home"
+     tool_tip="Teleport to my home location"
      width="24" >
 		<button.commit_callback
 		function="WMap.GoHome" />
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 6384b1238e..861b0de2cf 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -68,7 +68,7 @@
              parameter="inventory" />
         </menu_item_check>
         <menu_item_call
-         label="Show Sidetray Inventory"
+         label="Show Inventory in Side Tray"
          name="ShowSidetrayInventory"
          shortcut="control|I"
          visible="false">
@@ -433,6 +433,8 @@
         </menu_item_check>
         <menu_item_separator
          layout="topleft" />-->
+        <menu_item_separator
+         layout="topleft" />
         <menu_item_call
          label="Snapshot"
          layout="topleft"
@@ -442,6 +444,8 @@
              function="Floater.Show"
              parameter="snapshot" />
         </menu_item_call>
+        <menu_item_separator
+         layout="topleft" />
     <menu
          create_jump_keys="true"
          label="Sun"
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 0dea81eefe..1b70b95a93 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -10,11 +10,9 @@
  width="310">
     <panel.string
      name="help_text">
-        Notices let you send a message and
-an optionally attached item. Notices only go to
-group members in Roles with the ability to
-receive Notices. You can turn off Notices on
-the General tab.
+        Notices let you send a message and an optionally attached item.
+Notices only go to group members in Roles with the ability to receive Notices.
+You can turn off Notices on the General tab.
     </panel.string>
     <panel.string
      name="no_notices_text">
@@ -31,7 +29,7 @@ the General tab.
      name="lbl2"
      top="5"
      width="300">
-     Notices are kept for 14 days
+     Notices are kept for 14 days.
 Maximum 200 per group daily
     </text>
     <scroll_list
@@ -93,6 +91,7 @@ Maximum 200 per group daily
      layout="topleft"
      name="refresh_notices"
      right="-5"
+     tool_tip="Refresh list of notices"
      top_delta="0"
      width="23" />
     <panel
@@ -192,7 +191,7 @@ Maximum 200 per group daily
          top_pad="15"
          word_wrap="true"
          width="150">
-            Drag here to attach something -- >
+            Drag and drop item here to attach it:
         </text>
         <icon
          height="72"
@@ -228,7 +227,7 @@ Maximum 200 per group daily
          left="10"
          layout="topleft"
          name="drop_target"
-         tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice."
+         tool_tip="Drag an inventory item onto this target box to send it with this notice. You must have permission to copy and transfer the item in order to attach it."
          width="280" />
    </panel>
     <panel
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 a5bab3232c..9548119d58 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -258,7 +258,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          name="static"
          top_pad="5"
          width="300">
-            Assigned Roles
+            Assigned Members
         </text>
         <scroll_list
          draw_stripes="true"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 37d59de66f..aeb28e4c60 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -30,13 +30,16 @@
      layout="topleft"
      left_delta="-4"
      name="inventory filter tabs"
+     tab_min_width="70"
+     tab_height="30"
      tab_position="top"
-     top_pad="4"
+     top_pad="10"
+     halign="center"
      width="305">
         <inventory_panel
          follows="left|top|right|bottom"
          height="295"
-         label="All Items"
+         label="ALL ITEMS"
          layout="topleft"
          left="1"
          name="All Items"
@@ -45,7 +48,7 @@
         <inventory_panel
          follows="left|top|right|bottom"
          height="295"
-         label="Recent Items"
+         label="RECENT ITEMS"
          layout="topleft"
          left_delta="0"
          name="Recent Items"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3b32912fbf..7fafa63e57 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1770,7 +1770,8 @@ Clears (deletes) the media and all params from the given face.
 	<string name="tattoo">Tattoo</string>
 	<string name="invalid">invalid</string>
 
-	<!-- notify -->
+	<!-- LLGroupNotify -->
+	<!-- used in the construction of a Group Notice blue dialog box, buttons, tooltip etc. Seems to be no longer utilized by code in Viewer 2.0 -->
 	<string name="next">Next</string>
 	<string name="ok">OK</string>
 	<string name="GroupNotifyGroupNotice">Group Notice</string>
@@ -1780,6 +1781,7 @@ Clears (deletes) the media and all params from the given face.
 	<string name="GroupNotifyViewPastNotices">View past notices or opt-out of receiving these messages here.</string>
 	<string name="GroupNotifyOpenAttachment">Open Attachment</string>
 	<string name="GroupNotifySaveAttachment">Save Attachment</string>
+
   <string name="TeleportOffer">Teleport offering</string>
   <!-- start-up toast's string-->
   <string name="StartUpNotifications">New notifications arrived while you were away.</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 0e34243349..48baa2812d 100644
--- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
@@ -4,6 +4,7 @@
   search_button_visible="true"
   text_pad_left="7"
   select_on_focus="true"
+  text_tentative_color="TextFgTentativeColor"
   background_image="TextField_Search_Off"
   background_image_disabled="TextField_Search_Disabled"
   background_image_focused="TextField_Search_Active">
diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
index c2a70d4b39..5d429d5b5b 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
@@ -13,7 +13,8 @@
  <combo_editor
   name="child1"
   select_on_focus="true"
-  text_pad_left="30" 
+  text_pad_left="30"
+  text_tentative_color="TextFgTentativeColor"
   background_image="TextField_Search_Off"
   background_image_disabled="TextField_Search_Disabled"
   background_image_focused="TextField_Search_Active"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
index f644a710b2..1616e4c3f7 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
@@ -4,6 +4,7 @@
   search_button_visible="true"
   text_pad_left="6" 
   select_on_focus="true"
+  text_tentative_color="TextFgTentativeColor"
   background_image="TextField_Search_Off"
   background_image_disabled="TextField_Search_Disabled"
   background_image_focused="TextField_Search_Active" >