From eeb1970f79d34de3c8d531ae7d7da52d30246c36 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 3 Dec 2009 11:57:58 +0200
Subject: fixed normal bug EXT-3038 (Verb buttons in avatar profile panel don't
 have tool-tips)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_my_profile.xml | 2 ++
 indra/newview/skins/default/xui/en/panel_picks.xml      | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index fe3e010cf9..3c87331199 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -416,6 +416,7 @@
          left="10"
          label="Edit Profile"
          name="edit_profile_btn"
+         tool_tip="Edit your personal information"
          width="130" />
         <button
          follows="bottom|right"
@@ -423,6 +424,7 @@
          label="Edit Appearance"
          left_pad="10"
          name="edit_appearance_btn"
+         tool_tip="Create/edit your appearance: physical data, clothes and etc."
          right="-10"
          width="130" />
  </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 4c2bd67337..27f5e4e3de 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -138,6 +138,7 @@
          left="5"
          name="info_btn"
          tab_stop="false"
+         tool_tip="Show pic information"
          top="0"
          width="55" />
         <button
@@ -149,6 +150,7 @@
          left_pad="5"
          name="teleport_btn"
          tab_stop="false"
+         tool_tip="Teleport to the corresponding area"
          top="0"
          width="77" />
         <button
@@ -160,6 +162,7 @@
          left_pad="5"
          name="show_on_map_btn"
          tab_stop="false"
+         tool_tip="Show corresponding area on the world map"
          top="0"
          width="50" />
         </panel>
-- 
cgit v1.2.3


From 0c6c590a67279af2e082605fbc9d128718e18f7c Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 3 Dec 2009 12:07:31 +0200
Subject: fixed low bug EXT-3040 (Tool-tip for '+' icon on Picks tab says
 nothing about classifieds)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_picks.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 27f5e4e3de..52bc72fe86 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -106,7 +106,7 @@
              layout="topleft"
              left_pad="15"
              name="new_btn"
-             tool_tip="Create new pick at current location"
+             tool_tip="Create new pick or classified at current location"
              top="5"
              width="18" />
             <button
-- 
cgit v1.2.3


From 96a11910b19254e180247f76b9c0c201bbdf178c Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 4 Dec 2009 13:46:58 +0200
Subject: Fixed normal bug EXT-1710 (IM & Chat: System messages should have SL
 icon and title). "i" icon is temporarily used, changing it in xml to SL icon
 moved to new bug- EXT-3132.

--HG--
branch : product-engine
---
 indra/newview/skins/default/textures/textures.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 607b33fbb1..9c7726def3 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -481,6 +481,7 @@ with the same filename but different name
   <texture name="SliderThumb_Off" file_name="widgets/SliderThumb_Off.png" />
   <texture name="SliderThumb_Disabled" file_name="widgets/SliderThumb_Disabled.png" />
   <texture name="SliderThumb_Press" file_name="widgets/SliderThumb_Press.png" />
+  <texture name="SL_Logo" file_name="map_infohub.tga" />
 
   <texture name="Snapshot_Off" file_name="bottomtray/Snapshot_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
   <texture name="Snapshot_Over" file_name="bottomtray/Snapshot_Over.png" preload="false" />
-- 
cgit v1.2.3


From fc0679cd834b4580d9d87023376f146fa6988d5f Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 4 Dec 2009 14:51:58 +0200
Subject: Implemented normal task EXT-3082 (Remove Reply button from IM toasts
 and open IM window just by click on IM toast).

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_instant_message.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index 1e570bf207..ccd754ac5e 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  background_visible="true"
- height="175"
+ height="152"
  label="im_panel"
  layout="topleft"
  left="0"
@@ -83,13 +83,4 @@
      width="285"
      word_wrap="true"
      max_length="350" />
-    <button
-     follows="bottom"
-     height="23"
-     label="Reply"
-     layout="topleft"
-     left="100"
-     name="reply"
-     top="144"
-     width="100" />
 </panel>
-- 
cgit v1.2.3


From 22303da8a61e60dd061b5a63f6d023fd1345b59c Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 3 Dec 2009 13:48:07 +0200
Subject: Work on task EXT-3081 (Separate Message Well on Notifications Well
 and IM Well) Initial commit  -- added two floater classes derived from
 LLSysWellWindow to work with Notification Well & IM Well  -- register two
 floaters in place of previous sys_well (but with the same xml file)  --
 replace using of LLSysWellWindow with LLNotificationWellWindow in the out
 code (except of in LLScreenChannel::updateShowToastsState)  -- rename member
 variable in bottom tray used for Notification Well

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_bottomtray.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index ec3f7ea7c5..9679d22e70 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -319,7 +319,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          layout="topleft"
          min_height="28"
          top="0"
-         name="sys_well_panel"
+         name="notification_well_panel"
          width="54"
          min_width="54"
          user_resize="false">
@@ -328,7 +328,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
              height="23"
              layout="topleft"
              left="0"
-             name="sys_well"
+             name="notification_well"
              top="4"
              width="54">
               <button
-- 
cgit v1.2.3


From 653ebfbe7ca53515d6c83f6ba72cbb1d3e2d9daf Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 4 Dec 2009 12:48:08 +0200
Subject: Work on normal task EXT-3081 (Separate Message Well on Notifications
 Well and IM Well) Refactored toggle interaction between Notification Well and
 Notification Well Window:  -- set "Button.SetDockableFloaterToggle" init
 callback to Notification Well  -- remove deprecated functionality in code  --
 update interaction with screen channels to work properly.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_sys_well.xml | 7 ++++---
 indra/newview/skins/default/xui/en/panel_bottomtray.xml | 7 +++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml
index be6d63716c..4e9388c2b2 100644
--- a/indra/newview/skins/default/xui/en/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml
@@ -6,19 +6,20 @@
  top="0" 
  follows="right|bottom"
  layout="topleft"
- name="notification_chiclet"
+ name="sys_well_window"
  help_topic="notification_chiclet"
  save_rect="true"
  title="NOTIFICATIONS" 
  width="320"
  min_width="320"
  height="23"
- can_minimize="true"
+ can_minimize="false"
  can_tear_off="false"
  can_resize="true"
  can_drag_on_left="false"
- can_close="false"
  can_dock="true"
+ save_visibility="true"
+ single_instance="true"
 >
     <flat_list_view
 	    color="FloaterDefaultBackgroundColor"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 9679d22e70..621dbdec61 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -346,8 +346,11 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
                image_overlay_alignment="right" 
                pad_right="6"
                pad_left="6"
-               width="54"
-               />
+               width="54" >
+                  <button.init_callback
+                   function="Button.SetDockableFloaterToggle"
+                   parameter="notification_well_window" />
+              </button>
 	    </chiclet_notification>
         </layout_panel>
        <icon
-- 
cgit v1.2.3


From 1acc52a7e781a7931d1fc6bfc2313c49eb6be2a2 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 4 Dec 2009 14:00:52 +0200
Subject: Work on normal task EXT-3081 (Separate Message Well on Notifications
 Well and IM Well)  -- removed member pointer to Notification Well Icon from
 the LLBottomTray  -- placed Well counter over the Icon, made center-aligned

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_bottomtray.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 621dbdec61..2796b4a1f7 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -320,8 +320,8 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          min_height="28"
          top="0"
          name="notification_well_panel"
-         width="54"
-         min_width="54"
+         width="34"
+         min_width="34"
          user_resize="false">
             <chiclet_notification
              follows="right"
@@ -330,23 +330,23 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
              left="0"
              name="notification_well"
              top="4"
-             width="54">
+             width="34">
               <button
                  image_selected="PushButton_Selected_Press"
                  image_pressed="PushButton_Press"
 		 image_pressed_selected="PushButton_Selected_Press"
               auto_resize="true"
-               halign="right"
+               halign="center"
                height="23"
                follows="right"
                flash_color="EmphasisColor"
                left="0"
                name="Unread"
                image_overlay="Notices_Unread"
-               image_overlay_alignment="right" 
-               pad_right="6"
-               pad_left="6"
-               width="54" >
+               image_overlay_alignment="center" 
+               pad_right="0"
+               pad_left="0"
+               width="34" >
                   <button.init_callback
                    function="Button.SetDockableFloaterToggle"
                    parameter="notification_well_window" />
-- 
cgit v1.2.3


From 87c6a2964325f7771cf03f6f7e82253a132c0e6d Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Fri, 4 Dec 2009 20:01:09 +0800
Subject:  EXT-2956 Animation preview floater play/pause buttons are hard-coded

---
 .../default/xui/en/floater_animation_preview.xml   | 35 ++++++++++++++++------
 1 file changed, 26 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
index a8f875754e..4f4288b654 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
@@ -456,26 +456,43 @@ Maximum animation length is [MAX_LENGTH] seconds.
      image_overlay="Play_Over"
      image_unselected="SegmentedBtn_Left_Off"
      image_selected="SegmentedBtn_Left_On_Selected"
-        image_disabled_selected="SegmentedBtn_Left_Selected_Disabled"
-        image_disabled="SegmentedBtn_Left_Disabled"
-	image_pressed="SegmentedBtn_Left_Press"
-	image_pressed_selected="SegmentedBtn_Left_Selected_Press"
+	 image_disabled_selected="SegmentedBtn_Left_Selected_Disabled"
+	 image_disabled="SegmentedBtn_Left_Disabled"
+	 image_pressed="SegmentedBtn_Left_Press"
+	 image_pressed_selected="SegmentedBtn_Left_Selected_Press"
      layout="topleft"
      left="10"
      name="play_btn"
-     tool_tip="Play/pause your animation"
+     tool_tip="Play your animation"
      top_pad="0"
      width="23" />
+    <button
+	 visible = "false"
+     follows="top|right"
+     height="23"
+     image_overlay="Pause_Over"
+     image_unselected="SegmentedBtn_Left_Off"
+     image_selected="SegmentedBtn_Left_On_Selected"
+	 image_disabled_selected="SegmentedBtn_Left_Selected_Disabled"
+	 image_disabled="SegmentedBtn_Left_Disabled"
+	 image_pressed="SegmentedBtn_Left_Press"
+	 image_pressed_selected="SegmentedBtn_Left_Selected_Press"
+     layout="topleft"
+     left="10"
+     name="pause_btn"
+     tool_tip="Pause your animation"
+     top_pad="-23"
+     width="23" />	 
     <button
      follows="top|right"
      height="23"
      image_overlay="StopReload_Over"
      image_unselected="SegmentedBtn_Right_Off"
      image_selected="SegmentedBtn_Right_On_Selected"
-        image_disabled_selected="SegmentedBtn_Right_Selected_Disabled"
-        image_disabled="SegmentedBtn_Right_Disabled"
-	image_pressed="SegmentedBtn_Right_Press"
-	image_pressed_selected="SegmentedBtn_Right_Selected_Press"
+	 image_disabled_selected="SegmentedBtn_Right_Selected_Disabled"
+	 image_disabled="SegmentedBtn_Right_Disabled"
+	 image_pressed="SegmentedBtn_Right_Press"
+	 image_pressed_selected="SegmentedBtn_Right_Selected_Press"
      layout="topleft"
      name="stop_btn"
      tool_tip="Stop animation playback"
-- 
cgit v1.2.3


From 5d4959e3a107a6a40014528dd8e17e46bf128540 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Fri, 4 Dec 2009 22:25:12 +0800
Subject: EXT-2827 Unable to delete object when select face of object

---
 indra/newview/skins/default/xui/en/floater_animation_preview.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
index 4f4288b654..26ace7b617 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
@@ -525,7 +525,7 @@ Maximum animation length is [MAX_LENGTH] seconds.
 We recommend BVH files exported from Poser 4.
     </text>
     <button
-    	top="580"
+	 top="580"
      follows="bottom|left"
      height="23"
      label="Upload (L$[AMOUNT])"
@@ -534,7 +534,7 @@ We recommend BVH files exported from Poser 4.
      name="ok_btn"
      width="128" />
     <button
-    	top="580"
+	 top="580"
      follows="bottom|left"
      height="23"
      label="Cancel"
-- 
cgit v1.2.3


From 69cd9ac98bde4d602a8bdb785ac576df958ea1f5 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 4 Dec 2009 18:31:57 +0200
Subject: Completed normal task EXT-3081 (Separate Message Well on
 Notifications Well and IM Well)  -- created IM Wel icon  -- functionality is
 moved from the base class into appropriate classes (for Notification & IM
 Well windows)

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_bottomtray.xml      | 43 +++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 2796b4a1f7..7f847237ce 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -312,6 +312,47 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          min_width="4" 
          top="0"
          width="5"/>
+        <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         top="0"
+         name="im_well_panel"
+         width="34"
+         min_width="34"
+         user_resize="false">
+            <chiclet_im_well
+             follows="right"
+             height="23"
+             layout="topleft"
+             left="0"
+             name="im_well"
+             top="4"
+             width="34">
+                <button
+                 auto_resize="true"
+                 flash_color="EmphasisColor"
+                 follows="right"
+                 halign="center"
+                 height="23"
+                 image_overlay="Notices_Unread"
+                 image_overlay_alignment="center" 
+                 image_pressed="PushButton_Press"
+                 image_pressed_selected="PushButton_Selected_Press"
+                 image_selected="PushButton_Selected_Press"
+                 left="0"
+                 name="Unread IM messages"
+                 pad_left="0"
+                 pad_right="0"
+                 width="34" >
+                    <button.init_callback
+                     function="Button.SetDockableFloaterToggle"
+                     parameter="im_well_window" />
+                </button>
+            </chiclet_im_well>
+        </layout_panel>
         <layout_panel
          auto_resize="false"
          follows="right"
@@ -353,7 +394,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
               </button>
 	    </chiclet_notification>
         </layout_panel>
-       <icon
+        <icon
          auto_resize="false"
          color="0 0 0 0"
          follows="left|right"
-- 
cgit v1.2.3


From 28a1ee9da8d58955590e3596409d2f49b130e1fc Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Fri, 4 Dec 2009 18:33:13 +0200
Subject: =?UTF-8?q?implemented=20EXT-700=20=E2=80=9C"Offer"=20notification?=
 =?UTF-8?q?s=20should=20be=20accessible=20via=20chiclet=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f48cc6d4bf..0d7351395a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4499,14 +4499,14 @@ You don&apos;t have permission to copy this.
   <notification
    icon="notifytip.tga"
    name="InventoryAccepted"
-   type="notifytip">
+   type="offer">
 [NAME] received your inventory offer.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="InventoryDeclined"
-   type="notifytip">
+   type="offer">
 [NAME] declined your inventory offer.
   </notification>
 
-- 
cgit v1.2.3


From 1a7013d5cf63006ff9f4d30b21c4f369915de332 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 4 Dec 2009 19:28:27 +0200
Subject: Implemented normal task EXT-2832 (Hide "undock" icon on the
 floaters).

--HG--
branch : product-engine
---
 indra/newview/skins/default/textures/textures.xml      | 3 ---
 indra/newview/skins/default/xui/en/strings.xml         | 1 -
 indra/newview/skins/default/xui/en/widgets/floater.xml | 2 --
 3 files changed, 6 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index fbb910b847..771726d466 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -204,9 +204,6 @@ with the same filename but different name
   <texture name="Icon_Restore_Foreground" file_name="windows/Icon_Restore_Foreground.png" preload="false" />
   <texture name="Icon_Restore_Press" file_name="windows/Icon_Restore_Press.png" preload="false" />
 
-  <texture name="Icon_Undock_Foreground" file_name="windows/Icon_Undock_Foreground.png" preload="false" />
-  <texture name="Icon_Undock_Press" file_name="windows/Icon_Undock_Press.png" preload="false" />
-
   <texture name="Info" file_name="icons/Info.png" preload="false" />
   <texture name="Info_Small" file_name="icons/Info_Small.png" preload="false" />
   <texture name="Info_Off" file_name="navbar/Info_Off.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e47ec1ebda..194e359e10 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -88,7 +88,6 @@
 	<string name="BUTTON_MINIMIZE">Minimize</string>
 	<string name="BUTTON_TEAR_OFF">Tear Off</string>
 	<string name="BUTTON_DOCK">Dock</string>
-	<string name="BUTTON_UNDOCK">Undock</string>
 	<string name="BUTTON_HELP">Show Help</string>
 
 	<!-- searching - generic -->
diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
index 2263866471..70ee9fc3b8 100644
--- a/indra/newview/skins/default/xui/en/widgets/floater.xml
+++ b/indra/newview/skins/default/xui/en/widgets/floater.xml
@@ -13,13 +13,11 @@
   minimize_image="Icon_Minimize_Foreground"
   tear_off_image="tearoffbox.tga"
   dock_image="Icon_Dock_Foreground"
-  undock_image="Icon_Undock_Foreground"
   help_image="Icon_Help_Foreground"
   close_pressed_image="Icon_Close_Press"
   restore_pressed_image="Icon_Restore_Press"
   minimize_pressed_image="Icon_Minimize_Press"
   tear_off_pressed_image="tearoff_pressed.tga"
   dock_pressed_image="Icon_Dock_Press"
-  undock_pressed_image="Icon_Undock_Press"
   help_pressed_image="Icon_Help_Press"
   />
-- 
cgit v1.2.3


From c28fd45839b0a1924c80bc289a90e4756e677472 Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Fri, 4 Dec 2009 20:46:04 +0200
Subject: omg fix for two omg crtical bugs... EXT-3109 Viewer crashes when
 attempting to select group role EXT-3130 Viewer crashes after pressing "New
 Role" button in group profile also a bit fix layout

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_group_roles.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

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 5bae5c2711..a5bab3232c 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -367,7 +367,7 @@ things in this group. There&apos;s a broad variety of Abilities.
         <text_editor
          type="string"
          halign="left"
-         height="50"
+         height="35"
          layout="topleft"
          left="0"
          max_length="295"
@@ -424,6 +424,10 @@ things in this group. There&apos;s a broad variety of Abilities.
          tool_tip="For details of each allowed ability see the abilities tab"
          top_pad="0"
          width="300">
+            <scroll_list.columns
+             label=""
+             name="icon"
+             width="2" />
             <scroll_list.columns
              label=""
              name="checkbox"
-- 
cgit v1.2.3


From b725027713912c5baaa3d812db939247cec2fae1 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 4 Dec 2009 12:00:30 -0800
Subject: EXT-1498 Can't adjust nav bar info button location in XML Removed C++
 code overriding the location. Trivial, not reviewed.

---
 indra/newview/skins/default/xui/en/widgets/location_input.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 0e2700cb80..17fb58764b 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -22,9 +22,12 @@
                 >
   <!-- *NOTE: Tooltips are in strings.xml so they can be localized.
   See LocationCtrlAddLandmarkTooltip etc. -->
-  <info_button name="Place Information"
-                          width="16"
-                          height="16"
+  <info_button
+    name="Place Information"
+    width="16"
+    height="16"
+    left="4" 
+    top="20" 
                           follows="left|top"
                           hover_glow_amount="0.15"
                           image_unselected="Info_Off"
-- 
cgit v1.2.3


From bd4ae13c5c14c44648d271284306daa89875b9bb Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Fri, 4 Dec 2009 13:34:27 -0800
Subject: EXT-2854 (small addition) Localizability: consistency to a few places
 when referring generically to a choice of - Select one -

---
 indra/newview/skins/default/xui/en/floater_sell_land.xml   | 2 +-
 indra/newview/skins/default/xui/en/panel_classified.xml    | 2 +-
 indra/newview/skins/default/xui/en/panel_group_general.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml
index e6a78563f3..409f46b960 100644
--- a/indra/newview/skins/default/xui/en/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml
@@ -182,7 +182,7 @@
      width="130">
         <combo_box.item
          enabled="false"
-         label="-- select one --"
+         label="- Select one -"
          name="--selectone--"
          value="select" />
         <combo_box.item
diff --git a/indra/newview/skins/default/xui/en/panel_classified.xml b/indra/newview/skins/default/xui/en/panel_classified.xml
index 9622313786..c8293d3663 100644
--- a/indra/newview/skins/default/xui/en/panel_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified.xml
@@ -107,7 +107,7 @@
      top="48"
      width="130">
         <combo_box.item
-         label="- Select Mature -"
+         label="- Select one -"
          name="select_mature"
          value="Select" />
         <combo_box.item
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 043edd10e1..e5dc4df0f8 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -145,7 +145,7 @@ Hover your mouse over the options for more help.
          layout="topleft"
          left="10"
          name="group_mature_check"
-         tool_tip="Sets whether your group information is considered moderate"
+         tool_tip="Sets whether your group contains information rated as Moderate"
          top_pad="0"
          width="190">
             <combo_box.item
-- 
cgit v1.2.3


From f644dde8c9239e45348279229ded70620c3297d4 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Fri, 4 Dec 2009 13:55:20 -0800
Subject: Added back forward home button art to sidetray home buttons

---
 .../default/xui/en/panel_sidetray_home_tab.xml     | 49 +++++++++++-----------
 1 file changed, 24 insertions(+), 25 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index 4b841b0a09..605058825e 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -28,44 +28,43 @@
      top="0"
      user_resize="false"
      width="313">
-      <button
-       follows="left|top"
+          <button
        enabled="false"
-       height="20"
-       label="Back"
-       layout="topleft"
+	     follows="left|top"
+	     height="18"
+	     image_overlay="Arrow_Left_Off"
+	     layout="topleft"
        tab_stop="false"
        left="0"
        name="back"
-       top="0"
-       width="70">
+	     tool_tip="Back"
+	     width="25" >
         <button.commit_callback
          function="MediaBrowser.Back" />
       </button>
-      <button
-       follows="left|top"
-       height="20"
+             <button
+	     follows="left|top"
+	     height="18"
        enabled="false"
-       label="Forward"
-       layout="topleft"
-       tab_stop="false"
-       left_pad="3"
+	     image_overlay="Arrow_Right_Off"
+	     layout="topleft"
+	     left_pad="3"
        name="forward"
-       top_delta="0"
-       width="70">
+	     tool_tip="Forward"
+	     width="25">
         <button.commit_callback
          function="MediaBrowser.Forward" />
-      </button>
-      <button
-       follows="left|top"
-       height="20"
-       label="Home"
-       layout="topleft"
+         </button>
+
+	    <button
+	     follows="left|top"
+	     height="18"
+	     image_overlay="Home_Press"
+	     layout="topleft"
+	     left_pad="20"
        tab_stop="false"
-       left_pad="2"
        name="home"
-       top_delta="0"
-       width="70">
+	     width="25">
         <button.commit_callback
          function="MediaBrowser.Home" />
       </button>
-- 
cgit v1.2.3


From 6e50ea94d2aae2653d5de3e4e160a2c4c0557f3b Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Fri, 4 Dec 2009 14:02:14 -0800
Subject: L10N:  use better, consistent language in a preference about IMs.

---
 indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 3aa5d3fae4..fff53c1de2 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -332,7 +332,7 @@
      control_name="ChatWindow"
      name="chat_window"
      top_pad="10"
-     tool_tip="Show chat in multiple windows(by default) or in one multi-tabbed window (requires restart)"
+     tool_tip="Show your Instant Messages in separate windows, or in one window with many tabs (Requires restart)"
      width="331">
      <radio_item
       height="16"
-- 
cgit v1.2.3


From 9d268e0a4b3df48a74cd609255903a7c64ccfc35 Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Fri, 4 Dec 2009 14:05:30 -0800
Subject: L10N:  fix a typo. Use natural, consistent language in tool_tips
 about Picks.

---
 indra/newview/skins/default/xui/en/panel_picks.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 52bc72fe86..4facedc7ea 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -106,7 +106,7 @@
              layout="topleft"
              left_pad="15"
              name="new_btn"
-             tool_tip="Create new pick or classified at current location"
+             tool_tip="Create a new pick or classified at the current location"
              top="5"
              width="18" />
             <button
@@ -138,7 +138,7 @@
          left="5"
          name="info_btn"
          tab_stop="false"
-         tool_tip="Show pic information"
+         tool_tip="Show pick information"
          top="0"
          width="55" />
         <button
@@ -162,7 +162,7 @@
          left_pad="5"
          name="show_on_map_btn"
          tab_stop="false"
-         tool_tip="Show corresponding area on the world map"
+         tool_tip="Show the corresponding area on the World Map"
          top="0"
          width="50" />
         </panel>
-- 
cgit v1.2.3


From 7efab06d57624f6d7568abacef667468f11ed2ba Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Fri, 4 Dec 2009 15:11:15 -0800
Subject: L10N:  use consistent language in the Admin menu 'Force owner'
 options

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 37136af680..38e5a28166 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3415,7 +3415,7 @@
          name="Parcel"
          tear_off="true">
             <menu_item_call
-             label="Owner To Me"
+             label="Force Owner To Me"
              layout="topleft"
              name="Owner To Me">
                 <menu_item_call.on_click
-- 
cgit v1.2.3


From 7a83e8913d2eb6485eaf63e89a1ccc138a5a738f Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 4 Dec 2009 16:05:04 -0800
Subject: EXT-3176 Resizing the nav bar resizes the world view Trivial XML
 change.

---
 indra/newview/skins/default/xui/en/main_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index a11ebf5af8..65a545d2ed 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -19,6 +19,7 @@
                   mouse_opaque="false"
                   name="nav_bar_container"
                   width="1024"
+                  user_resize="false" 
                   visible="false">
     </layout_panel>
     <layout_panel auto_resize="true"
@@ -43,7 +44,7 @@
                layout="topleft"
                mouse_opaque="false"
                name="non_side_tray_view"
-               user_resize="true"
+               user_resize="false"
                width="500">
           <view bottom="500"
                 follows="all"
-- 
cgit v1.2.3


From fdb25e5add7305d8b92067f610eff1b5c18482de Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 7 Dec 2009 14:20:33 +0200
Subject: Aditional changes for normal task EXT-3081 (Separate Message Well on
 Notifications Well and IM Well)  -- set different titles for IM &
 Notification Well windows  -- set different anchors for IM & Notification
 Well windows

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_sys_well.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml
index 4e9388c2b2..3fc57372de 100644
--- a/indra/newview/skins/default/xui/en/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml
@@ -21,6 +21,15 @@
  save_visibility="true"
  single_instance="true"
 >
+    <string
+     name="title_im_well_window">
+        IM SESSIONS
+    </string>
+    <string
+     name="title_notification_well_window">
+        NOTIFICATIONS
+    </string>
+     
     <flat_list_view
 	    color="FloaterDefaultBackgroundColor"
 	    follows="all"
-- 
cgit v1.2.3


From 0a617f15a83262ab472ca88f146c57bb0f6a6a73 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Mon, 7 Dec 2009 15:15:41 +0200
Subject: =?UTF-8?q?implemented=20EXT-2797=20=E2=80=9CMaking=20friendship?=
 =?UTF-8?q?=20offer=20should=20be=20recorded=20into=20IM=20history?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0d7351395a..c4946b895e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5128,6 +5128,13 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O
        text="Decline"/>
     </form>
   </notification>
+  
+  <notification
+   icon="notify.tga"
+   name="FriendshipOffered"
+   type="offer">
+	You have offered friendship to [TO_NAME]
+  </notification>
 
   <notification
    icon="notify.tga"
-- 
cgit v1.2.3


From 329d5553027c5a1aacae6b01dc57db8f94510b6d Mon Sep 17 00:00:00 2001
From: "Justin C. Rounds (Chuck)" <chuck@lindenlab.com>
Date: Mon, 7 Dec 2009 12:51:37 -0500
Subject: Set font size to SansSerifSmall.
 http://jira.secondlife.com/browse/EXT-2773

---
 indra/newview/skins/default/xui/en/widgets/spinner.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/widgets/spinner.xml b/indra/newview/skins/default/xui/en/widgets/spinner.xml
index ab3f8df5f8..d7af6077e5 100644
--- a/indra/newview/skins/default/xui/en/widgets/spinner.xml
+++ b/indra/newview/skins/default/xui/en/widgets/spinner.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <spinner text_enabled_color="LabelTextColor"
          text_disabled_color="LabelDisabledColor"
-         font="SansSerif" 
+         font="SansSerifSmall" 
          decimal_digits="3"
          label_width="40" >
   <spinner.up_button name="SpinCtrl Up"
-- 
cgit v1.2.3


From c3a82913deb9b23ef1f22b6d002893b36146553a Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Mon, 7 Dec 2009 22:44:44 +0200
Subject: Fixed normal bug EXT-3018([BSI] Hook up "Go to My Dashboard" in
 Profile to link to http://secondlife.com/my)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_edit_profile.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index a833ad97d9..bbf86089cb 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -50,6 +50,10 @@
     name="partner_edit_link_url">
        http://www.secondlife.com/account/partners.php?lang=en
    </string>
+   <string
+    name="my_account_link_url">
+       http://secondlife.com/my
+   </string>
    <string
     name="no_partner_text"
     value="None" />
@@ -256,7 +260,7 @@
          layout="topleft"
          left="10"
          name="my_account_link"
-	 value="Go to My Dashboard"
+         value="[[URL] Go to My Dashboard]"
          width="285" />
         <text
          follows="left|top|right"
-- 
cgit v1.2.3


From 15fabd6b602c3ea0e8f09e6338e3a4f580c1acd4 Mon Sep 17 00:00:00 2001
From: "Justin C. Rounds (Chuck)" <chuck@lindenlab.com>
Date: Mon, 7 Dec 2009 16:34:34 -0500
Subject: Tweaks to make toasts conform to style guide.
 http://jira.secondlife.com/browse/EXT-1673

---
 indra/newview/skins/default/xui/en/panel_toast.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 6479fc91ca..707b24c92c 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -46,7 +46,7 @@
   </text>
   <button
     layout="topleft"
-    top="-6"
+    top="-14"
     left="293"
     width="17"
     height="17"
-- 
cgit v1.2.3


From 1d60a4c67817292a1e0b32d96fa8effbac2f6285 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 7 Dec 2009 17:15:49 -0500
Subject: EXT-2826 : Rename "Favorite" folder to "Favorites" folder

Only will affect new accounts.

--HG--
branch : avatar-pipeline
---
 indra/newview/skins/default/xui/en/panel_landmarks.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index c52b0c83d0..1f211c0fed 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -32,7 +32,7 @@
              left="0"
              mouse_opaque="true"
              name="favorites_list"
-             start_folder="Favorite"
+             start_folder="Favorites"
              width="380"/>
         </accordion_tab>
         <accordion_tab
-- 
cgit v1.2.3


From 7e905ac8ccfacded36af1d779490f8df826d8209 Mon Sep 17 00:00:00 2001
From: "Justin C. Rounds (Chuck)" <chuck@lindenlab.com>
Date: Mon, 7 Dec 2009 17:33:32 -0500
Subject: 1. Adjusted vertical placement of nearby voice chat indicator. 2.
 Added text padding on the right of the chat input field to prevent
 overlapping of text and nearby voice chat indicator.
 https://jira.secondlife.com/browse/EXT-3177
 https://jira.secondlife.com/browse/EXT-3155

---
 indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index de612fbbc3..2543656a8b 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -22,6 +22,7 @@
      label="Click here to chat."
      layout="topleft"
      left_delta="7"
+     text_pad_right="25"
      left="0"
      max_length="512"
      name="chat_box"
@@ -37,7 +38,7 @@
      left_pad="-24"
      mouse_opaque="true"
      name="chat_zone_indicator"
-     top="1"
+     top="6"
      visible="true"
      width="20" />
     <button
-- 
cgit v1.2.3


From cdb7fe119eeb337c1343679a76e5a9ac12bb6b76 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Mon, 7 Dec 2009 14:38:51 -0800
Subject: Appearance panel layout changes for Nyx - contains bug causing
 accordion to not follow sidepanel bottom

---
 .../default/xui/en/panel_outfits_inventory.xml     | 123 +++------
 .../skins/default/xui/en/sidepanel_appearance.xml  | 276 +++++++++++++--------
 2 files changed, 206 insertions(+), 193 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index 51997a2813..0567d722d5 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -1,56 +1,52 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Outfits" 
-	  bottom="0" 
-	  height="326" 
-	  left="0" 
-	  width="310"
-	  border="true"
-	  follows="left|top|right|bottom">
+<panel name="Outfits"
+ follows="all"
+border="false">
     <accordion
-     follows="left|top|right|bottom"
-     height="315"
-     layout="topleft"
+     single_expansion="true"
+      follows="top|left|bottom"
+      height="460"
+      layout="topleft"
      left="0"
      name="outfits_accordion"
-     top="2"
-     width="310">
-        <accordion_tab
+     top="0"
+     width="333">
+     <accordion_tab
          layout="topleft"
-         name="tab_outfits"
-         title="Outfits">
-	 <inventory_panel 
-	 	 allow_multi_select="true" 
-		 border="true" 
+         name="tab_cof"
+         title="Current Outfit">
+	 <inventory_panel
+	 	 allow_multi_select="true"
+		 border="false"
 		 bottom="0"
-	     follows="left|top|right|bottom" 
-		 height="326" 
-		 left="0" 
+	         follows="all"
+		 height="416"
+		 left="0"
 		 mouse_opaque="true"
-	     name="outfitslist_accordionpanel"
-		 width="310"
-		 start_folder="My Outfits"/>
+	         name="cof_accordionpanel"
+		 width="333"
+		 start_folder="Current Outfit" />
         </accordion_tab>
         <accordion_tab
          layout="topleft"
-         name="tab_cof"
-         title="Current Outfit">
-	 <inventory_panel 
-	 	 allow_multi_select="true" 
-		 border="true" 
+         name="tab_outfits"
+         title="My Outfits">
+	 <inventory_panel
+	 	 allow_multi_select="true"
+		 border="false"
 		 bottom="0"
-	     follows="left|top|right|bottom" 
-		 height="326" 
-		 left="0" 
+	     follows="all"
+		 height="415"
+		 left="0"
 		 mouse_opaque="true"
-	     name="cof_accordionpanel"
-		 width="310"
-		 start_folder="Current Outfit"/>
+	     name="outfitslist_accordionpanel"
+		 width="333"
+		 start_folder="My Outfits" />
         </accordion_tab>
 	</accordion>
-
-	<button bottom="0"
+	<!--<button bottom="0"
 		 halign="center"
-		 height="16"
+		 height="23"
 		 label=">"
 		 enabled="false"
 	     mouse_opaque="false"
@@ -59,54 +55,5 @@
 		 left="0"
 		 visible="false"
 	     follows="right|bottom"
-		 tool_tip="View outfit properties"/>
-    <panel
-     background_visible="true"
-     bevel_style="none"
-     bottom="0"
-     follows="left|right|bottom"
-     height="30"
-     layout="bottomleft"
-     left="0"
-	 visible="true"
-     name="bottom_panel"
-     width="310">
-        <button
-         follows="bottom|left"
-         tool_tip="Show additional options"
-         height="18"
-         image_disabled="OptionsMenu_Disabled"
-         image_selected="OptionsMenu_Press"
-         image_unselected="OptionsMenu_Off"
-         layout="topleft"
-         left="10"
-         name="options_gear_btn"
-         picture_style="true"
-         top="6"
-         width="18" />
-        <button
-         follows="bottom|left"
-         height="18"
-         image_selected="AddItem_Press"
-         image_unselected="AddItem_Off"
-         image_disabled="AddItem_Disabled"
-         layout="topleft"
-         left_pad="5"
-         name="add_btn"
-         picture_style="true"
-         tool_tip="Add new item"
-         width="18" />
-        <dnd_button
-         follows="bottom|right"
-         height="18"
-         image_selected="TrashItem_Press"
-         image_unselected="TrashItem_Off"
-         layout="topleft"
-         right="-5"
-         name="trash_btn"
-         picture_style="true"
-         tool_tip="Remove selected item"
-         top="6"
-         width="18" />
-    </panel>
+		 tool_tip="View outfit properties" />-->
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 4dae8e48a0..886887c2b5 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -1,111 +1,177 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-	  background_visible="true"
-	  follows="all"
-	  height="400"
-	  label="Appearance"
-	  layout="topleft"
-	  min_height="350"
-	  min_width="240"
-	  name="appearance panel"
-	  width="333">
-	 <string
-      name="No Outfit"
-	  value="No Outfit" />
-     <panel
-		 left="5" width="320" height="55"
-		 background_visible="true"
-		 background_opaque="false"
-		 bg_alpha_color="0.2 0.2 0.2 1.0"
-		 name="panel_currentlook"
-		 follows="left|top|right">
-  	    <button
-  	     	 follows="left|right|top"
-  	     	 font="SansSerif"
-  	     	 top="28" right="-10" width="60" height="20"
-  	     	 layout="topleft"
-  		 	 label="Edit"
-  	     	 name="editappearance_btn"/>
-        <button
-	     follows="left|right|top"
-		 top="28" left="5" width="25" height="22"
-	     image_overlay="Inv_LookFolderOpen"
-	     layout="topleft"
-		 name="openoutfit_btn"
-	     picture_style="true" />
-		<text
-			 top="10" width="150" left="5" height="15" follows="left|right|top"
-			 layout="topleft"
-        	 font="SansSerif" text_color="LtGray" word_wrap="true"
-        	 mouse_opaque="false" name="currentlook_title">
-					Current Outfit:
-    	</text>
-  		<text
-			 top="32" width="150" left="32" height="15" follows="left|right|top"
-			 layout="topleft"
-      		 font="SansSerifBold" text_color="white" word_wrap="true"
-      		 mouse_opaque="false" name="currentlook_name" >
-					MyOutfit
-  		</text>
-	</panel>
-
+background_visible="true"
+ follows="all"
+ height="570"
+  label="My Appearance"
+  layout="topleft"
+ min_height="350"
+  name="appearance panel"
+ width="333">
+ <string
+name="No Outfit"
+value="No Outfit" />
+<panel
+ left="0"
+ top="0"
+ follows="top|left"
+layout="topleft"
+ width="333"
+ height="45"
+ background_visible="true"
+ background_opaque="false"
+ bg_alpha_color="MouseGray"
+ name="panel_currentlook"
+ >
+<button
+   follows="left|top"
+        top="0"  width="1" height="1"
+        layout="topleft"
+	left="0"
+        name="editappearance_btn" />
+   <button
+   follows="left|top"
+        top="0"  width="1" height="1"
+        layout="topleft"
+	left="3"
+ name="openoutfit_btn" />
+<icon
+ follows="top|left"
+ height="30"
+ image_name="TabIcon_Appearance_Off"
+ name="outfit_icon"
+ mouse_opaque="false"
+ visible="true"
+ left="5"
+ top="0"
+ width="30" />
+<text
+ width="292"
+ height="22"
+follows="top|left"
+ layout="topleft"
+ left_pad="5"
+font="SansSerifLarge"
+font.style="BOLD"
+word_wrap="false"
+use_ellipses="true"
+mouse_opaque="false"
+ text_color="white"
+ name="currentlook_name">
+MyOutfit With a really Long Name like MOOSE
+    </text>
+  <text
+width="290"
+left="40"
+height="1"
+follows="top|left"
+ layout="topleft"
+ top_pad="-2"
+mouse_opaque="false"
+ name="currentlook_title" >
+(now wearing)
+  </text>
+</panel>
     <filter_editor
-  	     follows="left|top|right"
-  	     font="SansSerif"
-  	     label="Filter"
-  	     layout="topleft"
-  	     left="15" 
-		 width="313"
-		 height="20"
-  	     name="Filter" />
+     follows="top|left"
+     height="23"
+     layout="topleft"
+     left="15"
+     label="Filter"
+     max_length="300"
+     name="Filter"
+     top_pad="7"
+     width="303" />
     <panel
-   	     class="panel_outfits_inventory"
-   	     filename="panel_outfits_inventory.xml"
- 	     name="panel_outfits_inventory"
-  	     follows="all"
-  	     height="271"
-  	     halign="center"
-  	     layout="topleft"
-  	     left="10"
-  	     top_pad="19"
-  	     width="313" />
-    <button
-  	     follows="bottom|left"
-  	     height="25"
-  	     label="Wear"
-  	     layout="topleft"
-  	     left="10"
-  	     name="wear_btn"
-     	 top_pad="0"
-       	 width="80" />
+     follows="top|left"
+     halign="center"
+     height="500"
+     layout="topleft"
+    class="panel_outfits_inventory"
+      filename="panel_outfits_inventory.xml"
+      name="panel_outfits_inventory"
+     min_height="300"
+      left="0"
+      top_pad="3"
+	width="333"
+       />
+   <panel
+     background_visible="true"
+     follows="top|left"
+     height="19"
+     layout="topleft"
+     left="0"
+     visible="true"
+     name="bottom_panel"
+     width="333">
+        <button
+         follows="bottom|left"
+         tool_tip="Show additional options"
+         height="18"
+         image_disabled="OptionsMenu_Disabled"
+         image_selected="OptionsMenu_Press"
+         image_unselected="OptionsMenu_Off"
+         layout="topleft"
+         left="10"
+         name="options_gear_btn"
+         top="6"
+         width="18" />
+        <button
+         follows="bottom|left"
+         height="18"
+         image_selected="AddItem_Press"
+         image_unselected="AddItem_Off"
+         image_disabled="AddItem_Disabled"
+         layout="topleft"
+         left_pad="5"
+         name="add_btn"
+         tool_tip="Add new item"
+         width="18" />
+        <dnd_button
+         follows="bottom|left"
+         height="18"
+         image_selected="TrashItem_Press"
+         image_unselected="TrashItem_Off"
+         layout="topleft"
+         right="-5"
+         name="trash_btn"
+         tool_tip="Remove selected item"
+         top="6"
+         width="18" />
     <button
-    	 follows="bottom|left"
-  	     height="25"
-  	     label="New Outfit"
-  	     layout="topleft"
-  	     left_pad="0"
-  	     name="newlook_btn"
-  	     top_delta="0"
-   	     width="90" />
-
-	<panel
-       	 class="panel_look_info"
-       	 filename="panel_look_info.xml"
-       	 follows="all"
-       	 layout="topleft"
-       	 left="0"
-       	 name="panel_look_info"
-       	 top="-200"
-       	 visible="false" />
-
-	<panel
-	   	 class="panel_edit_wearable"
-	   	 filename="panel_edit_wearable.xml"
-	   	 follows="all"
-	   	 layout="topleft"
-	   	 left="0"
-	   	 name="panel_edit_wearable"
-	   	 top="-200"
-	   	 visible="false"
-	   	 width="333" />
+     follows="top|left"
+       height="23"
+       label="Wear"
+       layout="topleft"
+       name="wear_btn"
+       right="-5"
+       top_pad="0"
+        width="90" />
+    </panel>
+ <!--   <button
+     follows="bottom|left"
+       height="23"
+       label="New outfit"
+       layout="topleft"
+       left_pad="5"
+       right="-10"
+       name="newlook_btn"
+        width="100" />-->
+<panel
+        class="panel_look_info"
+        filename="panel_look_info.xml"
+        follows="all"
+        layout="topleft"
+        left="0"
+        name="panel_look_info"
+        visible="false" />
+<panel
+    class="panel_edit_wearable"
+    filename="panel_edit_wearable.xml"
+    follows="all"
+    layout="topleft"
+    left="0"
+    name="panel_edit_wearable"
+    visible="false"
+    width="333" />
 </panel>
-- 
cgit v1.2.3


From 81c18d54426ffe8a331350ac975770f36b5df201 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 7 Dec 2009 15:15:52 -0800
Subject: EXT-3159 Mouse-wheel scrolling down causes unexpected side-scrolling
 If vertical scroll bar is visible, give it the scroll events and don't scroll
 horizontally.  Eliminated extraneous folder view item scroll handler. 
 Reviewed with Richard.

---
 .../skins/default/xui/en/floater_test_text_editor.xml        | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
index b0aa5c7c4f..8be0c28c5c 100644
--- a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
@@ -9,7 +9,6 @@
   <text_editor
    height="50"
    follows="top|left|bottom"
-   layout="topleft"
    left="10"
    name="test_text_editor"
    tool_tip="text editor"
@@ -17,4 +16,15 @@
    width="200">
     Text Editor
   </text_editor>
+  <text_editor
+   height="50"
+   follows="top|left|bottom"
+   font="SansSerif" 
+   left="10"
+   name="test_text_editor"
+   tool_tip="text editor"
+   top_pad="10"
+   width="200">
+    This contains long text and should scroll horizontally to the right
+  </text_editor>
 </floater>
-- 
cgit v1.2.3


From b65334a4c133984fed9466db60df92756e8de05d Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Mon, 7 Dec 2009 16:25:08 -0800
Subject: L10N: Add much-needed linguistic context in the comments of
 strings.xml; L10N: consistency in phrasing on the 2 separate places in the
 Nav Bar where you create/edit a Landmark Also, add a separator to menu_NavBar
 so its easier to parse visually.

---
 indra/newview/skins/default/xui/en/menu_navbar.xml |  2 ++
 indra/newview/skins/default/xui/en/strings.xml     | 14 ++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml
index e17eeb46f6..b71b866c4b 100644
--- a/indra/newview/skins/default/xui/en/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_navbar.xml
@@ -27,6 +27,8 @@
       <menu_item_check.on_check
         control="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
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b014b8d1c0..2449820958 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1882,6 +1882,7 @@ this texture in your inventory
 	<string name="InvFolder All">All</string>
 
 	<!-- inventory FVBridge -->
+	<!--  This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale  -->
 	<string name="Buy">Buy</string>
 	<string name="BuyforL$">Buy for L$</string>
 
@@ -2008,8 +2009,8 @@ this texture in your inventory
 
 	<!-- groups -->
 	<string name="GroupsNone">none</string>
-  <string name="Group" value=" (group)" />
-  <string name="Unknown">(Unknown)</string>
+	<string name="Group" value=" (group)" />
+	<string name="Unknown">(Unknown)</string>
 	<string name="SummaryForTheWeek"    value="Summary for this week, beginning on " />
 	<string name="NextStipendDay"       value="The next stipend day is " />
 	<string name="GroupIndividualShare" value="                      Group       Individual Share" />
@@ -2019,7 +2020,8 @@ this texture in your inventory
 	<string name="Total">Total</string>
 	<string name="NoGroupDataFound">No group data found for group </string>
 
-	<!-- floater IM -->
+	<!-- floater IM bonus_info: When a Linden with Admin/god status receives a new IM this displays the estate (Mainland vs. teen grid) of the source avatar.
+		This is to help Lindens when answering questions. -->
 	<string name="IMParentEstate">parent estate</string>
 	<string name="IMMainland">mainland</string>
 	<string name="IMTeen">teen</string>
@@ -2108,8 +2110,8 @@ this texture in your inventory
 		Unknown file extension .%s
 Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	</string>
-	<string name="AddLandmarkNavBarMenu">Add Landmark...</string>
-	<string name="EditLandmarkNavBarMenu">Edit Landmark...</string>
+	<string name="AddLandmarkNavBarMenu">Add to My Landmarks...</string>
+	<string name="EditLandmarkNavBarMenu">Edit my Landmark...</string>
 
 	<!-- menu accelerators -->
 	<string name="accel-mac-control">&#8963;</string>
@@ -2780,7 +2782,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <!-- Navigation bar location input control.
        Strings are here because widget xml is not localizable -->
   <string name="LocationCtrlAddLandmarkTooltip">Add to My Landmarks</string>
-  <string name="LocationCtrlEditLandmarkTooltip">Edit My Landmark</string>
+  <string name="LocationCtrlEditLandmarkTooltip">Edit my Landmark</string>
   <string name="LocationCtrlInfoBtnTooltip">See more info about the current location</string>
   <string name="LocationCtrlComboBtnTooltip">My location history</string>
   <string name="LocationCtrlForSaleTooltip">Buy this land</string>
-- 
cgit v1.2.3


From 6301211b7c9fc214c6dcfb6b8a573e62a0fb9bad Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Mon, 7 Dec 2009 17:28:39 -0800
Subject: EXT-2855 delete 2 more entries in strings.xml that are not actually
 user-visible

---
 indra/newview/skins/default/xui/en/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index df991b173a..3b32912fbf 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2389,8 +2389,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Eyes Bugged">Eyes Bugged</string>
 
 
-<string name="Eyes Shear Left Up">Eyes Shear Left Up</string>
-<string name="Eyes Shear Right Up">Eyes Shear Right Up</string>
+
+
 
 
 
-- 
cgit v1.2.3


From 5df04533f67abc3e0dce520d0ddb8d70bc7cae27 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Tue, 8 Dec 2009 10:17:41 +0000
Subject: DEV-41358: Updated the Search URL to the new staging area.

---
 indra/newview/skins/default/xui/en/floater_search.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index c5d6f885d3..82e4d87b28 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -14,7 +14,7 @@
  width="670">
     <floater.string
      name="search_url">
-        http://eniac21.lindenlab.com:10001/viewer
+        http://int.searchwww-phx0.damballah.lindenlab.com/viewer
     </floater.string>
     <floater.string
      name="loading_text">
-- 
cgit v1.2.3


From da2a0385ae6ee8962ed5d4f991df95df13d8e89a Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Tue, 8 Dec 2009 10:28:45 +0000
Subject: DEV-43439: Remove Back/Forward/Home buttons from Home side panel.

As per request from Yoz. They will add navigation buttons to the
actual HTML content.
---
 .../default/xui/en/panel_sidetray_home_tab.xml     | 55 +---------------------
 1 file changed, 2 insertions(+), 53 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index 4b841b0a09..1dd4eb095c 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -20,58 +20,7 @@
    top_pad="10"
    width="313">
     <layout_panel
-     auto_resize="false"
-     height="20"
-     layout="topleft"
-     left="0"
-     name="nav_controls"
-     top="0"
-     user_resize="false"
-     width="313">
-      <button
-       follows="left|top"
-       enabled="false"
-       height="20"
-       label="Back"
-       layout="topleft"
-       tab_stop="false"
-       left="0"
-       name="back"
-       top="0"
-       width="70">
-        <button.commit_callback
-         function="MediaBrowser.Back" />
-      </button>
-      <button
-       follows="left|top"
-       height="20"
-       enabled="false"
-       label="Forward"
-       layout="topleft"
-       tab_stop="false"
-       left_pad="3"
-       name="forward"
-       top_delta="0"
-       width="70">
-        <button.commit_callback
-         function="MediaBrowser.Forward" />
-      </button>
-      <button
-       follows="left|top"
-       height="20"
-       label="Home"
-       layout="topleft"
-       tab_stop="false"
-       left_pad="2"
-       name="home"
-       top_delta="0"
-       width="70">
-        <button.commit_callback
-         function="MediaBrowser.Home" />
-      </button>
-    </layout_panel>
-    <layout_panel
-     height="530"
+     height="550"
      layout="topleft"
      left_delta="0"
      name="browser_layout"
@@ -80,7 +29,7 @@
       <web_browser
        border_visible="false"
        follows="all"
-       height="530"
+       height="550"
        layout="topleft"
        left="0"
        name="browser"
-- 
cgit v1.2.3


From b133ed1ae0d6f7d1dd3738174895231c9a7aea2b Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Tue, 8 Dec 2009 11:22:45 +0000
Subject: EXT-2427: Added an About > Report Bug menu

This menu brings up the Help Browser with the report_bug topic.

To support this, I've created a new ShowHelp function that can be
accessed from XUI. You can supply an optional help topic parameter,
or if you specify no parameter then the default (F1) help is shown.
---
 indra/newview/skins/default/xui/en/menu_login.xml  |  3 +--
 indra/newview/skins/default/xui/en/menu_viewer.xml | 11 +++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index a22dc80f4e..9b439c16e0 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -45,8 +45,7 @@
          name="Second Life Help"
          shortcut="F1">
             <menu_item_call.on_click
-             function="ShowFloater"
-             parameter="help f1" />
+             function="ShowHelp" />
         </menu_item_call>
         <menu_item_separator />
         <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 37136af680..2b3f3c79e0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1060,8 +1060,7 @@
          name="Second Life Help"
          shortcut="F1">
             <menu_item_call.on_click
-             function="ShowFloater"
-             parameter="help f1" />
+             function="ShowHelp" />
         </menu_item_call>
         <menu_item_call
          label="Tutorial"
@@ -1081,6 +1080,14 @@
                  function="ShowFloater"
                  parameter="complaint reporter" />
             </menu_item_call>
+        <menu_item_call
+             label="Report Bug"
+             layout="topleft"
+             name="Report Bug">
+                <menu_item_call.on_click
+                 function="ShowHelp"
+                 parameter="report_bug" />
+            </menu_item_call>
         <menu_item_separator
              layout="topleft" />
         <menu_item_call
-- 
cgit v1.2.3


From 06429722acae74a856589ccf92d31c2e10b0832d Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Tue, 8 Dec 2009 12:20:22 +0000
Subject: EXT-2350: Added a help link to login panel.

There is now a new "Need help logging in?" link on the right-hand side
of the login panel. Clicking on this brings up the help browser with
the pre_login_help topic (the same as pressing F1).
---
 indra/newview/skins/default/textures/textures.xml  |  4 ++--
 indra/newview/skins/default/xui/en/panel_login.xml | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 7e309d2bad..6f9801491a 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -194,8 +194,8 @@ with the same filename but different name
   <texture name="Icon_Gear_Foreground" file_name="windows/Icon_Gear_Foreground.png" preload="false" />
   <texture name="Icon_Gear_Press" file_name="windows/Icon_Gear_Press.png" preload="false" />
 
-  <texture name="Icon_Help_Foreground" file_name="windows/Icon_Help_Foreground.png" preload="false" />
-  <texture name="Icon_Help_Press" file_name="windows/Icon_Help_Press.png" preload="false" />
+  <texture name="Icon_Help_Foreground" file_name="windows/Icon_Help_Foreground.png" preload="true" />
+  <texture name="Icon_Help_Press" file_name="windows/Icon_Help_Press.png" preload="true" />
   <texture name="Icon_Info" file_name="windows/Icon_Info.png" preload="false" />
 
   <texture name="Icon_Minimize_Foreground" file_name="windows/Icon_Minimize_Foreground.png" preload="true" />
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index efe26d3887..22977b2274 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -167,8 +167,8 @@
      text_color="EmphasisColor"
      halign="right"
      height="16"
-     top="17"
-     left_pad="10"
+     top="12"
+     left_pad="5"
      right="-10"
      name="create_new_account_text"
      width="180">
@@ -185,6 +185,17 @@
      width="180">
         Forgot your name or password?
     </text>
+    <text
+     follows="right|bottom"
+     font="SansSerifSmall"
+     text_color="EmphasisColor"
+     halign="right"
+     height="16"
+     name="login_help"
+     top_pad="2"
+     width="180">
+        Need help logging in?
+    </text>
     <text
      follows="right|bottom"
      font="SansSerifSmall"
-- 
cgit v1.2.3


From 9093b73a6ec8e2164a27a8df859527e7d1d6d8a5 Mon Sep 17 00:00:00 2001
From: Lis Pardi <lis@lindenlab.com>
Date: Tue, 8 Dec 2009 12:10:14 -0500
Subject: EXT-2821 Rename icons/parcel_lght_* and parcel_drk_* to something
 sensible

---
 indra/newview/skins/default/textures/textures.xml  | 86 +++++++++++-----------
 .../skins/default/xui/en/panel_landmark_info.xml   |  6 +-
 .../xui/en/panel_media_settings_security.xml       |  4 +-
 .../skins/default/xui/en/panel_place_profile.xml   | 46 ++++++------
 .../default/xui/en/panel_preferences_sound.xml     | 30 ++++----
 .../skins/default/xui/en/panel_status_bar.xml      |  4 +-
 .../default/xui/en/widgets/location_input.xml      | 16 ++--
 .../default/xui/en/widgets/output_monitor.xml      |  2 +-
 8 files changed, 97 insertions(+), 97 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index b1116dc0d2..49c1202d87 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -335,49 +335,49 @@ with the same filename but different name
   <texture name="Overhead_M" file_name="world/Overhead_M.png" preload="false" />
   <texture name="Overhead_S" file_name="world/Overhead_S.png" preload="false" />
 
-  <texture name="parcel_color_EVRY" file_name="icons/parcel_color_EVRY.png" preload="false" />
-  <texture name="parcel_color_EXP" file_name="icons/parcel_color_EXP.png" preload="false" />
-  <texture name="parcel_color_M" file_name="icons/parcel_color_M.png" preload="false" />
-
-  <texture name="parcel_drk_Build" file_name="icons/parcel_drk_Build.png" preload="false" />
- <texture name="parcel_drk_BuildNo" file_name="icons/parcel_drk_BuildNo.png" preload="false" />
- <texture name="parcel_drk_Damage" file_name="icons/parcel_drk_Damage.png" preload="false" />
- <texture name="parcel_drk_DamageNo" file_name="icons/parcel_drk_DamageNo.png" preload="false" />
- <texture name="parcel_drk_EVRY" file_name="icons/parcel_drk_EVRY.png" preload="false" />
- <texture name="parcel_drk_EXP" file_name="icons/parcel_drk_EXP.png" preload="false" />
- <texture name="parcel_drk_Fly" file_name="icons/parcel_drk_Fly.png" preload="false" />
- <texture name="parcel_drk_FlyNo" file_name="icons/parcel_drk_FlyNo.png" preload="false" />
- <texture name="parcel_drk_ForSale" file_name="icons/parcel_drk_ForSale.png" preload="false" />
- <texture name="parcel_drk_ForSaleNo" file_name="icons/parcel_drk_ForSaleNo.png" preload="false" />
- <texture name="parcel_drk_M" file_name="icons/parcel_drk_M.png" preload="false" />
- <texture name="parcel_drk_PG" file_name="icons/parcel_drk_PG.png" preload="false" />
- <texture name="parcel_drk_Push" file_name="icons/parcel_drk_Push.png" preload="false" />
- <texture name="parcel_drk_PushNo" file_name="icons/parcel_drk_PushNo.png" preload="false" />
- <texture name="parcel_drk_R" file_name="icons/parcel_drk_R.png" preload="false" />
- <texture name="parcel_drk_Scripts" file_name="icons/parcel_drk_Scripts.png" preload="false" />
- <texture name="parcel_drk_ScriptsNo" file_name="icons/parcel_drk_ScriptsNo.png" preload="false" />
- <texture name="parcel_drk_Voice" file_name="icons/parcel_drk_Voice.png" preload="false" />
- <texture name="parcel_drk_VoiceNo" file_name="icons/parcel_drk_VoiceNo.png" preload="false" />
-
- <texture name="parcel_lght_Build" file_name="icons/parcel_lght_Build.png" preload="false" />
- <texture name="parcel_lght_BuildNo" file_name="icons/parcel_lght_BuildNo.png" preload="false" />
- <texture name="parcel_lght_Damage" file_name="icons/parcel_lght_Damage.png" preload="false" />
- <texture name="parcel_lght_DamageNo" file_name="icons/parcel_lght_DamageNo.png" preload="false" />
- <texture name="parcel_lght_EVRY" file_name="icons/parcel_lght_EVRY.png" preload="false" />
- <texture name="parcel_lght_EXP" file_name="icons/parcel_lght_EXP.png" preload="false" />
- <texture name="parcel_lght_Fly" file_name="icons/parcel_lght_Fly.png" preload="false" />
- <texture name="parcel_lght_FlyNo" file_name="icons/parcel_lght_FlyNo.png" preload="false" />
- <texture name="parcel_lght_ForSale" file_name="icons/parcel_lght_ForSale.png" preload="false" />
- <texture name="parcel_lght_ForSaleNo" file_name="icons/parcel_lght_ForSaleNo.png" preload="false" />
- <texture name="parcel_lght_M" file_name="icons/parcel_lght_M.png" preload="false" />
- <texture name="parcel_lght_PG" file_name="icons/parcel_lght_PG.png" preload="false" />
- <texture name="parcel_lght_Push" file_name="icons/parcel_lght_Push.png" preload="false" />
- <texture name="parcel_lght_PushNo" file_name="icons/parcel_lght_PushNo.png" preload="false" />
- <texture name="parcel_lght_R" file_name="icons/parcel_lght_R.png" preload="false" />
- <texture name="parcel_lght_Scripts" file_name="icons/parcel_lght_Scripts.png" preload="false" />
- <texture name="parcel_lght_ScriptsNo" file_name="icons/parcel_lght_ScriptsNo.png" preload="false" />
- <texture name="parcel_lght_Voice" file_name="icons/parcel_lght_Voice.png" preload="false" />
- <texture name="parcel_lght_VoiceNo" file_name="icons/parcel_lght_VoiceNo.png" preload="false" />
+  <texture name="Parcel_Evry_Color" file_name="icons/Parcel_Evry_Color.png" preload="false" />
+  <texture name="Parcel_Exp_Color" file_name="icons/Parcel_Exp_Color.png" preload="false" />
+  <texture name="Parcel_M_Color" file_name="icons/Parcel_M_Color.png" preload="false" />
+
+ <texture name="Parcel_Build_Dark" file_name="icons/Parcel_Build_Dark.png" preload="false" />
+ <texture name="Parcel_BuildNo_Dark" file_name="icons/Parcel_BuildNo_Dark.png" preload="false" />
+ <texture name="Parcel_Damage_Dark" file_name="icons/Parcel_Damage_Dark.png" preload="false" />
+ <texture name="Parcel_DamageNo_Dark" file_name="icons/Parcel_DamageNo_Dark.png" preload="false" />
+ <texture name="Parcel_Evry_Dark" file_name="icons/Parcel_Evry_Dark.png" preload="false" />
+ <texture name="Parcel_Exp_Dark" file_name="icons/Parcel_Exp_Dark.png" preload="false" />
+ <texture name="Parcel_Fly_Dark" file_name="icons/Parcel_Fly_Dark.png" preload="false" />
+ <texture name="Parcel_FlyNo_Dark" file_name="icons/Parcel_FlyNo_Dark.png" preload="false" />
+ <texture name="Parcel_ForSale_Dark" file_name="icons/Parcel_ForSale_Dark.png" preload="false" />
+ <texture name="Parcel_ForSaleNo_Dark" file_name="icons/Parcel_ForSaleNo_Dark.png" preload="false" />
+ <texture name="Parcel_M_Dark" file_name="icons/Parcel_M_Dark.png" preload="false" />
+ <texture name="Parcel_PG_Dark" file_name="icons/Parcel_PG_Dark.png" preload="false" />
+ <texture name="Parcel_Push_Dark" file_name="icons/Parcel_Push_Dark.png" preload="false" />
+ <texture name="Parcel_PushNo_Dark" file_name="icons/Parcel_PushNo_Dark.png" preload="false" />
+ <texture name="Parcel_R_Dark" file_name="icons/Parcel_R_Dark.png" preload="false" />
+ <texture name="Parcel_Scripts_Dark" file_name="icons/Parcel_Scripts_Dark.png" preload="false" />
+ <texture name="Parcel_ScriptsNo_Dark" file_name="icons/Parcel_ScriptsNo_Dark.png" preload="false" />
+ <texture name="Parcel_Voice_Dark" file_name="icons/Parcel_Voice_Dark.png" preload="false" />
+ <texture name="Parcel_VoiceNo_Dark" file_name="icons/Parcel_VoiceNo_Dark.png" preload="false" />
+
+ <texture name="Parcel_Build_Light" file_name="icons/Parcel_Build_Light.png" preload="false" />
+ <texture name="Parcel_BuildNo_Light" file_name="icons/Parcel_BuildNo_Light.png" preload="false" />
+ <texture name="Parcel_Damage_Light" file_name="icons/Parcel_Damage_Light.png" preload="false" />
+ <texture name="Parcel_DamageNo_Light" file_name="icons/Parcel_DamageNo_Light.png" preload="false" />
+ <texture name="Parcel_Evry_Light" file_name="icons/Parcel_Evry_Light.png" preload="false" />
+ <texture name="Parcel_Exp_Light" file_name="icons/Parcel_Exp_Light.png" preload="false" />
+ <texture name="Parcel_Fly_Light" file_name="icons/Parcel_Fly_Light.png" preload="false" />
+ <texture name="Parcel_FlyNo_Light" file_name="icons/Parcel_FlyNo_Light.png" preload="false" />
+ <texture name="Parcel_ForSale_Light" file_name="icons/Parcel_ForSale_Light.png" preload="false" />
+ <texture name="Parcel_ForSaleNo_Light" file_name="icons/Parcel_ForSaleNo_Light.png" preload="false" />
+ <texture name="Parcel_M_Light" file_name="icons/Parcel_M_Light.png" preload="false" />
+ <texture name="Parcel_PG_Light" file_name="icons/Parcel_PG_Light.png" preload="false" />
+ <texture name="Parcel_Push_Light" file_name="icons/Parcel_Push_Light.png" preload="false" />
+ <texture name="Parcel_PushNo_Light" file_name="icons/Parcel_PushNo_Light.png" preload="false" />
+ <texture name="Parcel_R_Light" file_name="icons/Parcel_R_Light.png" preload="false" />
+ <texture name="Parcel_Scripts_Light" file_name="icons/Parcel_Scripts_Light.png" preload="false" />
+ <texture name="Parcel_ScriptsNo_Light" file_name="icons/Parcel_ScriptsNo_Light.png" preload="false" />
+ <texture name="Parcel_Voice_Light" file_name="icons/Parcel_Voice_Light.png" preload="false" />
+ <texture name="Parcel_VoiceNo_Light" file_name="icons/Parcel_VoiceNo_Light.png" preload="false" />
 
   <texture name="Pause_Off" file_name="icons/Pause_Off.png" preload="false" />
   <texture name="Pause_Over" file_name="icons/Pause_Over.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index a219e30b8b..68e58b27ec 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -46,13 +46,13 @@
     <!-- Texture names for rating icons -->
     <string
      name="icon_PG"
-     value="parcel_drk_PG" />
+     value="Parcel_PG_Dark" />
     <string
      name="icon_M"
-     value="parcel_drk_M" />
+     value="Parcel_M_Dark" />
     <string
      name="icon_R"
-     value="parcel_drk_R" />
+     value="Parcel_R_Dark" />
     <button
      follows="top|right"
      height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
index 7d9350b45f..6e82713f06 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
@@ -35,10 +35,10 @@
    right="-35"
    width="16"
    height="16"
-   image_name="parcel_color_EXP"
+   image_name="Parcel_Exp_Color"
    mouse_opaque="true"
    follows="top|left"
-   name="parcel_color_EXP"
+   name="Parcel_Exp_Color"
    />
   <text
    visible="true"
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 3f5da66dce..b25d9a7dfc 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -95,49 +95,49 @@
     <!-- Texture names for parcel permissions icons -->
     <string
      name="icon_PG"
-     value="parcel_drk_PG" />
+     value="Parcel_PG_Dark" />
     <string
      name="icon_M"
-     value="parcel_drk_M" />
+     value="Parcel_M_Dark" />
     <string
      name="icon_R"
-     value="parcel_drk_R" />
+     value="Parcel_R_Dark" />
     <string
      name="icon_Voice"
-     value="parcel_drk_Voice" />
+     value="Parcel_Voice_Dark" />
     <string
      name="icon_VoiceNo"
-     value="parcel_drk_VoiceNo" />
+     value="Parcel_VoiceNo_Dark" />
     <string
      name="icon_Fly"
-     value="parcel_drk_Fly" />
+     value="Parcel_Fly_Dark" />
     <string
      name="icon_FlyNo"
-     value="parcel_drk_FlyNo" />
+     value="Parcel_FlyNo_Dark" />
     <string
      name="icon_Push"
-     value="parcel_drk_Push" />
+     value="Parcel_Push_Dark" />
     <string
      name="icon_PushNo"
-     value="parcel_drk_PushNo" />
+     value="Parcel_PushNo_Dark" />
     <string
      name="icon_Build"
-     value="parcel_drk_Build" />
+     value="Parcel_Build_Dark" />
     <string
      name="icon_BuildNo"
-     value="parcel_drk_BuildNo" />
+     value="Parcel_BuildNo_Dark" />
     <string
      name="icon_Scripts"
-     value="parcel_drk_Scripts" />
+     value="Parcel_Scripts_Dark" />
     <string
      name="icon_ScriptsNo"
-     value="parcel_drk_ScriptsNo" />
+     value="Parcel_ScriptsNo_Dark" />
     <string
      name="icon_Damage"
-     value="parcel_drk_Damage" />
+     value="Parcel_Damage_Dark" />
     <string
      name="icon_DamageNo"
-     value="parcel_drk_DamageNo" />
+     value="Parcel_DamageNo_Dark" />
     <button
      follows="top|right"
      height="23"
@@ -335,7 +335,7 @@
                         <icon
                          follows="top|left"
                          height="16"
-                         image_name="parcel_drk_PG"
+                         image_name="Parcel_PG_Dark"
                          layout="topleft"
                          left="10"
                          name="rating_icon"
@@ -361,7 +361,7 @@
                         <icon
                          follows="top|left"
                          height="18"
-                         image_name="parcel_drk_Voice"
+                         image_name="Parcel_Voice_Dark"
                          layout="topleft"
                          left="10"
                          name="voice_icon"
@@ -388,7 +388,7 @@
                         <icon
                          follows="top|left"
                          height="18"
-                         image_name="parcel_drk_Fly"
+                         image_name="Parcel_Fly_Dark"
                          layout="topleft"
                          left="10"
                          name="fly_icon"
@@ -414,7 +414,7 @@
                         <icon
                          follows="top|left"
                          height="18"
-                         image_name="parcel_drk_Push"
+                         image_name="Parcel_Push_Dark"
                          layout="topleft"
                          left="10"
                          name="push_icon"
@@ -440,7 +440,7 @@
                         <icon
                          follows="top|left"
                          height="18"
-                         image_name="parcel_drk_Build"
+                         image_name="Parcel_Build_Dark"
                          layout="topleft"
                          left="10"
                          name="build_icon"
@@ -466,7 +466,7 @@
                         <icon
                          follows="top|left"
                          height="18"
-                         image_name="parcel_drk_Scripts"
+                         image_name="Parcel_Scripts_Dark"
                          layout="topleft"
                          left="10"
                          name="scripts_icon"
@@ -492,7 +492,7 @@
                         <icon
                          follows="top|left"
                          height="18"
-                         image_name="parcel_drk_Damage"
+                         image_name="Parcel_Damage_Dark"
                          layout="topleft"
                          left="10"
                          name="damage_icon"
@@ -591,7 +591,7 @@
                         <icon
                          follows="top|left"
                          height="16"
-                         image_name="parcel_drk_PG"
+                         image_name="Parcel_PG_Dark"
                          layout="topleft"
                          left_pad="0"
                          name="region_rating_icon"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 8ef2cdfc37..214e39614e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -34,8 +34,8 @@
      control_name="MuteAudio"
      follows="top|right"
      height="18"
-     image_selected="parcel_drk_VoiceNo"
-     image_unselected="parcel_drk_Voice"
+     image_selected="Parcel_VoiceNo_Dark"
+     image_unselected="Parcel_Voice_Dark"
      is_toggle="true"
      layout="topleft"
      left_pad="16"
@@ -79,8 +79,8 @@
      disabled_control="MuteAudio"
      follows="top|right"
      height="18"
-     image_selected="parcel_drk_VoiceNo"
-     image_unselected="parcel_drk_Voice"
+     image_selected="Parcel_VoiceNo_Dark"
+     image_unselected="Parcel_Voice_Dark"
      is_toggle="true"
      layout="topleft"
      left_pad="16"
@@ -114,8 +114,8 @@
      disabled_control="MuteAudio"
      follows="top|right"
      height="18"
-     image_selected="parcel_drk_VoiceNo"
-     image_unselected="parcel_drk_Voice"
+     image_selected="Parcel_VoiceNo_Dark"
+     image_unselected="Parcel_Voice_Dark"
      is_toggle="true"
      layout="topleft"
      left_pad="16"
@@ -149,8 +149,8 @@
      disabled_control="MuteAudio"
      follows="top|right"
      height="18"
-     image_selected="parcel_drk_VoiceNo"
-     image_unselected="parcel_drk_Voice"
+     image_selected="Parcel_VoiceNo_Dark"
+     image_unselected="Parcel_Voice_Dark"
      is_toggle="true"
      layout="topleft"
      left_pad="16"
@@ -184,8 +184,8 @@
      disabled_control="MuteAudio"
      follows="top|right"
      height="18"
-     image_selected="parcel_drk_VoiceNo"
-     image_unselected="parcel_drk_Voice"
+     image_selected="Parcel_VoiceNo_Dark"
+     image_unselected="Parcel_Voice_Dark"
      is_toggle="true"
      layout="topleft"
      left_pad="16"
@@ -219,8 +219,8 @@
      disabled_control="MuteAudio"
      follows="top|right"
      height="18"
-     image_selected="parcel_drk_VoiceNo"
-     image_unselected="parcel_drk_Voice"
+     image_selected="Parcel_VoiceNo_Dark"
+     image_unselected="Parcel_Voice_Dark"
      is_toggle="true"
      layout="topleft"
      left_pad="16"
@@ -268,8 +268,8 @@
      disabled_control="MuteAudio"
      follows="top|right"
      height="18"
-     image_selected="parcel_drk_VoiceNo"
-     image_unselected="parcel_drk_Voice"
+     image_selected="Parcel_VoiceNo_Dark"
+     image_unselected="Parcel_Voice_Dark"
      is_toggle="true"
      layout="topleft"
      left_pad="16"
@@ -475,7 +475,7 @@
     </text>-->
           <icon
              height="18"
-             image_name="parcel_lght_Voice"
+             image_name="Parcel_Voice_Light"
              left="80"
              name="speaker_icon"
              mouse_opaque="false"
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 5dcee9e965..57b090e5b4 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -72,8 +72,8 @@
     <button
      follows="right|bottom"
      height="16"
-     image_selected="parcel_drk_VoiceNo"
-     image_unselected="parcel_drk_Voice"
+     image_selected="Parcel_VoiceNo_Dark"
+     image_unselected="Parcel_Voice_Dark"
      is_toggle="true"
      left_pad="18"
      top="1"
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 17fb58764b..7ac44b412d 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -46,8 +46,8 @@
 			  left="-3" />
   <for_sale_button
     name="for_sale_btn"
-    image_unselected="parcel_lght_ForSale"
-    image_selected="parcel_lght_ForSale"
+    image_unselected="Parcel_ForSale_Light"
+    image_selected="Parcel_ForSale_Light"
     width="22"
     height="18"
     follows="right|top"
@@ -61,7 +61,7 @@
     height="18"
     top="21"
     follows="right|top"
-    image_name="parcel_lght_VoiceNo"
+    image_name="Parcel_VoiceNo_Light"
     />
   <fly_icon
     name="fly_icon"
@@ -69,7 +69,7 @@
     height="18"
     top="21"
     follows="right|top"
-    image_name="parcel_lght_FlyNo"
+    image_name="Parcel_FlyNo_Light"
     />
   <push_icon
     name="push_icon"
@@ -77,7 +77,7 @@
     height="18"
     top="21"
     follows="right|top"
-    image_name="parcel_lght_PushNo"
+    image_name="Parcel_PushNo_Light"
     />
   <build_icon
     name="build_icon"
@@ -85,7 +85,7 @@
     height="18"
     top="21"
     follows="right|top"
-    image_name="parcel_lght_BuildNo"
+    image_name="Parcel_BuildNo_Light"
     />
   <scripts_icon
     name="scripts_icon"
@@ -93,7 +93,7 @@
     height="18"
     top="21"
     follows="right|top"
-    image_name="parcel_lght_ScriptsNo"
+    image_name="Parcel_ScriptsNo_Light"
     />
   <!-- NOTE: Placeholder icon, there is no dark grayscale version -->
   <damage_icon
@@ -102,7 +102,7 @@
     height="18"
     top="21"
     follows="right|top"
-    image_name="parcel_lght_Damage"
+    image_name="Parcel_Damage_Light"
     />
   <!-- Default text color is invisible on top of nav bar background -->
   <damage_text
diff --git a/indra/newview/skins/default/xui/en/widgets/output_monitor.xml b/indra/newview/skins/default/xui/en/widgets/output_monitor.xml
index 98b3e2faaa..21b957d089 100644
--- a/indra/newview/skins/default/xui/en/widgets/output_monitor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/output_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <output_monitor
-  image_mute="parcel_lght_VoiceNo"
+  image_mute="Parcel_VoiceNo_Light"
   image_off="VoicePTT_Off"
   image_on="VoicePTT_On"
   image_level_1="VoicePTT_Lvl1"
-- 
cgit v1.2.3


From cc661fb9c8d01e28fa2a3c734059e9248d475b62 Mon Sep 17 00:00:00 2001
From: Lis Pardi <lis@lindenlab.com>
Date: Tue, 8 Dec 2009 12:11:20 -0500
Subject: EXT-2821 Rename icons/parcel_lght_* and parcel_drk_* to something
 sensible

---
 .../skins/default/textures/icons/Parcel_BuildNo_Dark.png  | Bin 0 -> 516 bytes
 .../skins/default/textures/icons/Parcel_BuildNo_Light.png | Bin 0 -> 505 bytes
 .../skins/default/textures/icons/Parcel_Build_Dark.png    | Bin 0 -> 343 bytes
 .../skins/default/textures/icons/Parcel_DamageNo_Dark.png | Bin 0 -> 457 bytes
 .../skins/default/textures/icons/Parcel_Damage_Dark.png   | Bin 0 -> 325 bytes
 .../skins/default/textures/icons/Parcel_Exp_Color.png     | Bin 0 -> 272 bytes
 .../skins/default/textures/icons/Parcel_FlyNo_Dark.png    | Bin 0 -> 424 bytes
 .../skins/default/textures/icons/Parcel_FlyNo_Light.png   | Bin 0 -> 429 bytes
 .../skins/default/textures/icons/Parcel_Fly_Dark.png      | Bin 0 -> 271 bytes
 .../skins/default/textures/icons/Parcel_ForSale_Light.png | Bin 0 -> 561 bytes
 .../skins/default/textures/icons/Parcel_Health_Dark.png   | Bin 0 -> 285 bytes
 .../skins/default/textures/icons/Parcel_M_Dark.png        | Bin 0 -> 333 bytes
 .../skins/default/textures/icons/Parcel_M_Light.png       | Bin 0 -> 322 bytes
 .../default/textures/icons/Parcel_NoScripts_Light.png     | Bin 0 -> 620 bytes
 .../skins/default/textures/icons/Parcel_PG_Dark.png       | Bin 0 -> 407 bytes
 .../skins/default/textures/icons/Parcel_PG_Light.png      | Bin 0 -> 387 bytes
 .../skins/default/textures/icons/Parcel_PushNo_Dark.png   | Bin 0 -> 523 bytes
 .../skins/default/textures/icons/Parcel_PushNo_Light.png  | Bin 0 -> 516 bytes
 .../skins/default/textures/icons/Parcel_Push_Dark.png     | Bin 0 -> 430 bytes
 .../skins/default/textures/icons/Parcel_R_Dark.png        | Bin 0 -> 319 bytes
 .../skins/default/textures/icons/Parcel_R_Light.png       | Bin 0 -> 309 bytes
 .../default/textures/icons/Parcel_ScriptsNo_Dark.png      | Bin 0 -> 620 bytes
 .../skins/default/textures/icons/Parcel_Scripts_Dark.png  | Bin 0 -> 471 bytes
 .../skins/default/textures/icons/Parcel_VoiceNo_Dark.png  | Bin 0 -> 492 bytes
 .../skins/default/textures/icons/Parcel_VoiceNo_Light.png | Bin 0 -> 516 bytes
 .../skins/default/textures/icons/Parcel_Voice_Dark.png    | Bin 0 -> 380 bytes
 .../skins/default/textures/icons/Parcel_Voice_Light.png   | Bin 0 -> 405 bytes
 27 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_BuildNo_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_BuildNo_Light.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_Build_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_DamageNo_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_Damage_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_Exp_Color.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_ForSale_Light.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_Health_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_M_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_M_Light.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_NoScripts_Light.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_PG_Light.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_PushNo_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_PushNo_Light.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_Push_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_R_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_R_Light.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_ScriptsNo_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_Scripts_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Light.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_Voice_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_Voice_Light.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Dark.png
new file mode 100644
index 0000000000..fb1f7d3a6d
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Light.png b/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Light.png
new file mode 100644
index 0000000000..e6f614b844
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Light.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Build_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Build_Dark.png
new file mode 100644
index 0000000000..84a96a60cb
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_Build_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_DamageNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_DamageNo_Dark.png
new file mode 100644
index 0000000000..d55ebd7c67
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_DamageNo_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Damage_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Damage_Dark.png
new file mode 100644
index 0000000000..ae4077488b
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_Damage_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Exp_Color.png b/indra/newview/skins/default/textures/icons/Parcel_Exp_Color.png
new file mode 100644
index 0000000000..4813d37198
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_Exp_Color.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png
new file mode 100644
index 0000000000..0455a52fdc
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png b/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png
new file mode 100644
index 0000000000..be0c379d84
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png
new file mode 100644
index 0000000000..ed4a512e04
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_ForSale_Light.png b/indra/newview/skins/default/textures/icons/Parcel_ForSale_Light.png
new file mode 100644
index 0000000000..d28e5357df
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_ForSale_Light.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Health_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Health_Dark.png
new file mode 100644
index 0000000000..d72f02f708
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_Health_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_M_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_M_Dark.png
new file mode 100644
index 0000000000..2f5871b8ff
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_M_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_M_Light.png b/indra/newview/skins/default/textures/icons/Parcel_M_Light.png
new file mode 100644
index 0000000000..724ac22744
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_M_Light.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_NoScripts_Light.png b/indra/newview/skins/default/textures/icons/Parcel_NoScripts_Light.png
new file mode 100644
index 0000000000..f82354959e
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_NoScripts_Light.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png
new file mode 100644
index 0000000000..f0565f02dd
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PG_Light.png b/indra/newview/skins/default/textures/icons/Parcel_PG_Light.png
new file mode 100644
index 0000000000..f32b0570a1
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_PG_Light.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PushNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PushNo_Dark.png
new file mode 100644
index 0000000000..8f0fe6a04d
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_PushNo_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PushNo_Light.png b/indra/newview/skins/default/textures/icons/Parcel_PushNo_Light.png
new file mode 100644
index 0000000000..eba7070b4d
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_PushNo_Light.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Push_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Push_Dark.png
new file mode 100644
index 0000000000..08c2a18ac3
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_Push_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_R_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_R_Dark.png
new file mode 100644
index 0000000000..e0e6e14cca
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_R_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_R_Light.png b/indra/newview/skins/default/textures/icons/Parcel_R_Light.png
new file mode 100644
index 0000000000..efca6776da
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_R_Light.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_ScriptsNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_ScriptsNo_Dark.png
new file mode 100644
index 0000000000..8f9f37a1bf
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_ScriptsNo_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Scripts_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Scripts_Dark.png
new file mode 100644
index 0000000000..8b1d6c5e14
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_Scripts_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Dark.png
new file mode 100644
index 0000000000..eace54ae79
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Light.png b/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Light.png
new file mode 100644
index 0000000000..0d07e552b1
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Light.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Voice_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Voice_Dark.png
new file mode 100644
index 0000000000..b36a9bd2f0
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_Voice_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Voice_Light.png b/indra/newview/skins/default/textures/icons/Parcel_Voice_Light.png
new file mode 100644
index 0000000000..86ce19474a
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_Voice_Light.png differ
-- 
cgit v1.2.3


From ba8d1431c9fe9d66d62fb7e6ecb4fde3d0b242e8 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Tue, 8 Dec 2009 09:58:38 -0800
Subject: Standardizing layout and button sizes for various panels, added
 refresh button art, reduced floater sizes

---
 .../skins/default/xui/en/floater_select_key.xml    | 33 ++++-----
 .../skins/default/xui/en/floater_telehub.xml       | 49 ++++++-------
 .../skins/default/xui/en/floater_top_objects.xml   | 84 +++++++++++-----------
 .../skins/default/xui/en/inspect_remote_object.xml | 67 +++++++++--------
 .../default/xui/en/panel_block_list_sidetray.xml   | 45 ++++++------
 .../newview/skins/default/xui/en/panel_friends.xml | 10 +--
 .../default/xui/en/panel_group_control_panel.xml   | 42 +++++------
 .../skins/default/xui/en/panel_my_profile.xml      | 34 ++++-----
 8 files changed, 174 insertions(+), 190 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index af4fdff044..6050aede79 100644
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
@@ -4,30 +4,31 @@
  border="false"
  can_close="false"
  can_minimize="false"
- height="100"
+ height="90"
  layout="topleft"
  name="modal container"
  width="240">
-    <button
-     height="20"
-     label="Cancel"
-     label_selected="Cancel"
-     layout="topleft"
-     left="138"
-     name="Cancel"
-     top="70"
-     width="82" />
     <text
      type="string"
+     halign="center"
      length="1"
      follows="left|top"
-     font="SansSerif"
-     height="16"
+     height="30"
      layout="topleft"
-     left="20"
+     left="10"
      name="Save item as:"
-     top="10"
-     width="200">
-        Press a key to select
+     top="25"
+     word_wrap="true"
+     width="220">
+        Press a key to set your
+Speak button toggle
     </text>
+    <button
+     height="23"
+     label="Cancel"
+     label_selected="Cancel"
+     layout="topleft"
+     right="-10"
+     name="Cancel"
+     width="100" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml
index 374f014908..bb463edd4d 100644
--- a/indra/newview/skins/default/xui/en/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/en/floater_telehub.xml
@@ -6,7 +6,7 @@
  name="telehub"
  help_topic="telehub"
  title="TELEHUB"
- width="280">
+ width="330">
     <text
      type="string"
      length="1"
@@ -16,7 +16,7 @@
      left="10"
      name="status_text_connected"
      top="24"
-     width="200">
+     width="315">
         Telehub connected to object [OBJECT]
     </text>
     <text
@@ -28,7 +28,7 @@
      left_delta="0"
      name="status_text_not_connected"
      top_delta="0"
-     width="200">
+     width="315">
         No telehub connected.
     </text>
     <text
@@ -40,7 +40,7 @@
      left_delta="0"
      name="help_text_connected"
      top_delta="16"
-     width="260">
+     width="315">
         To remove, click Disconnect.
     </text>
     <text
@@ -52,78 +52,73 @@
      left_delta="0"
      name="help_text_not_connected"
      top_delta="0"
-     width="260">
+     width="315">
         Select object and click Connect Telehub.
     </text>
     <button
      follows="top|left"
-     height="20"
+     height="23"
      label="Connect Telehub"
      layout="topleft"
      left_delta="0"
      name="connect_btn"
      top_delta="20"
-     width="110" />
+     width="130" />
     <button
      follows="top|left"
-     height="20"
+     height="23"
      label="Disconnect"
      layout="topleft"
      left_pad="10"
      name="disconnect_btn"
      top_delta="0"
-     width="110" />
+     width="130" />
     <text
      type="string"
      length="1"
      follows="left|top"
-     height="16"
+     height="14"
      layout="topleft"
      left="10"
      name="spawn_points_text"
      top="84"
-     width="200">
+     width="315">
         Spawn Points (positions, not objects):
     </text>
     <scroll_list
      follows="left|top"
      height="60"
      layout="topleft"
-     left_delta="0"
      name="spawn_points_list"
-     top_delta="16"
-     width="230" />
+     width="315" />
     <button
      follows="top|left"
-     height="20"
+     height="23"
      label="Add Spawn"
      layout="topleft"
-     left_delta="0"
      name="add_spawn_point_btn"
-     top_pad="5"
-     width="110" />
+     width="130" />
     <button
      follows="top|left"
-     height="20"
+     height="23"
      label="Remove Spawn"
      layout="topleft"
      left_pad="10"
      name="remove_spawn_point_btn"
-     top_delta="0"
-     width="110" />
+     width="130" />
     <text
      type="string"
      length="1"
      follows="top|left"
-     height="80"
+     height="56"
      layout="topleft"
      left="10"
      name="spawn_point_help"
-     top="190"
-     width="260">
-        Select object and click Add to specify position.
-You may then move or delete the object.
+     word_wrap="true"
+     width="317">
+        Select object and click "Add Spawn" to specify position.
+You can then move or delete the object.
 Positions are relative to the telehub center.
-Select item in list to show position in world.
+Select an item in list to highlight it inworld.
     </text>
 </floater>
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 d2db26daec..68bb500c78 100644
--- a/indra/newview/skins/default/xui/en/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml
@@ -8,7 +8,7 @@
  min_width="450"
  name="top_objects"
  help_topic="top_objects"
- title="LOADING..."
+ title="Top Objects"
  width="550">
     <floater.string
      name="top_scripts_title">
@@ -46,24 +46,24 @@
      type="string"
      length="1"
      follows="left|top"
-     font="SansSerif"
      height="20"
      layout="topleft"
      left="10"
      name="title_text"
-     top="30"
+     top="20"
+     text_color="EmphasisColor"
      width="400">
         Loading...
     </text>
     <scroll_list
      draw_heading="true"
-     follows="left|top|bottom|right"
-     height="150"
+     follows="all"
+     height="170"
      layout="topleft"
      left_delta="0"
      multi_select="true"
      name="objects_list"
-     top_delta="20"
+     top_delta="17"
      width="530">
         <scroll_list.columns
          label="Score"
@@ -109,16 +109,16 @@
      follows="left|bottom|right"
      height="20"
      layout="topleft"
-     left_delta="70"
+     left_pad="3"
      name="id_editor"
      top_delta="-3"
-     width="350" />
+     width="325" />
     <button
      follows="bottom|right"
-     height="20"
+     height="23"
      label="Show Beacon"
      layout="topleft"
-     left_pad="10"
+     left_pad="5"
      name="show_beacon_btn"
      top_delta="0"
      width="100">
@@ -132,25 +132,25 @@
      height="20"
      layout="topleft"
      left="10"
+     top_pad="5"
      name="obj_name_text"
-     top="237"
      width="100">
-        Object Name:
+        Object name:
     </text>
     <line_editor
      follows="left|bottom|right"
      height="20"
      layout="topleft"
-     left_delta="70"
+     left_pad="3"
      name="object_name_editor"
      top_delta="-3"
-     width="350" />
+     width="325" />
     <button
      follows="bottom|right"
-     height="20"
+     height="23"
      label="Filter"
      layout="topleft"
-     left_pad="10"
+     left_pad="5"
      name="filter_object_btn"
      top_delta="0"
      width="100">
@@ -164,46 +164,58 @@
      height="20"
      layout="topleft"
      left="10"
+     top_pad="5"
      name="owner_name_text"
-     top="264"
      width="100">
-        Owner Name:
+        Owner:
     </text>
     <line_editor
      follows="left|bottom|right"
      height="20"
      layout="topleft"
-     left_delta="70"
+     left_pad="3"
      name="owner_name_editor"
      top_delta="-3"
-     width="350" />
+     width="325" />
     <button
      follows="bottom|right"
-     height="20"
+     height="23"
      label="Filter"
      layout="topleft"
-     left_pad="10"
+     left_pad="5"
      name="filter_owner_btn"
      top_delta="0"
      width="100">
       <button.commit_callback
           function="TopObjects.GetByOwnerName" />
     </button>
+    <button
+     follows="top|left"
+     height="22"
+     image_overlay="Refresh_Off"
+     layout="topleft"
+     name="refresh_btn"
+     right="-8"
+     top_pad="5"
+     width="23">
+      <button.commit_callback
+          function="TopObjects.Refresh" />
+    </button>
     <button
      follows="bottom|left"
-     height="20"
+     height="23"
      label="Return Selected"
      layout="topleft"
-     left="10"
+     left="112"
+     top_delta="0"
      name="return_selected_btn"
-     top="295"
      width="130">
       <button.commit_callback
           function="TopObjects.ReturnSelected" />
     </button>
     <button
      follows="bottom|left"
-     height="20"
+     height="23"
      label="Return All"
      layout="topleft"
      left_pad="10"
@@ -215,19 +227,19 @@
     </button>
     <button
      follows="bottom|left"
-     height="20"
+     height="23"
      label="Disable Selected"
      layout="topleft"
-     left="10"
+
+     left="112"
      name="disable_selected_btn"
-     top="320"
      width="130">
       <button.commit_callback
           function="TopObjects.DisableSelected" />
     </button>
     <button
      follows="bottom|left"
-     height="20"
+     height="23"
      label="Disable All"
      layout="topleft"
      left_pad="10"
@@ -237,16 +249,4 @@
       <button.commit_callback
           function="TopObjects.DisableAll" />
     </button>
-    <button
-     bottom="315"
-     follows="bottom|right"
-     height="20"
-     label="Refresh"
-     layout="topleft"
-     name="refresh_btn"
-     right="-10"
-     width="100">
-      <button.commit_callback
-          function="TopObjects.Refresh" />
-    </button>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/inspect_remote_object.xml b/indra/newview/skins/default/xui/en/inspect_remote_object.xml
index b5f2abf52a..ef3dd844cd 100644
--- a/indra/newview/skins/default/xui/en/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_remote_object.xml
@@ -6,10 +6,10 @@
 <floater
  legacy_header_height="18"
  bevel_style="in"
- bg_opaque_image="Inspector_Background" 
+ bg_opaque_image="Inspector_Background"
  can_close="false"
  can_minimize="false"
- height="145"
+ height="130"
  layout="topleft"
  name="inspect_remote_object"
  single_instance="true"
@@ -18,79 +18,78 @@
  width="300">
   <text
    follows="all"
-   font="SansSerifLargeBold"
-   height="16"
+   font="SansSerifLarge"
+   font_style="BOLD"
+   height="30"
    left="8"
    name="object_name"
    text_color="White"
    top="5"
    use_ellipses="true"
-   width="290">
-     Test Object Name That Is Really Long
+   word_wrap="true"
+   width="291">
+     Test Object Name That Is Really Long OMG so long I can't believe how long the name of this object is, I mean really.
   </text>
   <text
-   follows="all"
-   font="SansSerif"
-   height="20"
+   follows="top|left"
+   font="SansSerifSmall"
+   height="16"
    left="8"
    name="object_owner_label"
    width="55"
-   top_pad="20">
+   top_pad="12">
      Owner:
   </text>
   <text
    follows="top|left"
-   font="SansSerif"
-   height="20"
-   left_pad="10"
+   height="16"
+   left_pad="5"
    name="object_owner"
    use_ellipses="true"
-   width="200"
+   width="230"
    word_wrap="false">
      Longavatarname Johnsonlongstonnammer
   </text>
-  <text
+  <!--<text
    follows="top|left"
-   font="SansSerif"
-   height="20"
+   height="16"
    left="8"
    name="object_slurl_label"
-   top_pad="10"
+   top_pad="5"
    width="55">
      Location:
-  </text>
+  </text>-->
   <text
    follows="top|left"
-   height="20"
-   left_pad="10"
+   height="16"
+   left="8"
    name="object_slurl"
-   width="240"
+   width="290"
    use_ellipses="true"
    word_wrap="false">
      http://slurl.com/Ahern/50/50/50
   </text>
   <button
    follows="top|left"
-   height="20"
+   height="23"
    label="Map"
-   left="10"
+   left="8"
+   top_pad="8"
    name="map_btn"
-   top="114"
-   width="75" />
+   width="90" />
   <button
    follows="top|left"
-   height="20"
+   height="23"
    label="Block"
-   left_pad="5"
+   left_pad="8"
    name="block_btn"
-   top_delta="0"
-   width="75" />
+   width="90" />
   <button
    follows="top|left"
-   height="20"
+   height="23"
    label="Close"
-   right="-10"
+   right="-8"
    name="close_btn"
-   top_delta="0"
-   width="75" />
+   left_pad="5"
+   width="90" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index 3842c2a8db..970a2e6a8a 100644
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -8,31 +8,31 @@
  min_height="350"
  min_width="240"
  width="280">
-    <text 
+        <button
+     follows="top|left"
+     height="25"
+     image_overlay="BackArrow_Off"
+     layout="topleft"
+     name="back"
+     left="10"
+     tab_stop="false"
+     top="0"
+     width="25"/>
+    <text
      follows="top|left|right"
-     font="SansSerifHugeBold"
+     font="SansSerifLargeBold"
      height="20"
      layout="topleft"
-     left="10" 
+     left_pad="10"
      name="title_text"
      text_color="white"
-     top="0" 
+     top="5"
      width="250">
         Blocked List
      </text>
-     <button 
-     follows="top|right"
-     height="25"
-     image_overlay="BackArrow_Off"
-     layout="topleft"
-     name="back"
-     right="-9"
-     tab_stop="false" 
-     top="0"
-     width="25"/>
     <scroll_list
-     follows="left|top|right|bottom"
-     height="200"
+     follows="all"
+     height="190"
      layout="topleft"
      left="5"
      name="blocked"
@@ -41,9 +41,8 @@
      width="270" />
     <button
      follows="left|bottom"
-     height="20"
-     label="Block Resident..."
-     label_selected="Block Resident..."
+     height="23"
+     label="Block person"
      layout="topleft"
      left_delta="0"
      name="Block resident..."
@@ -55,9 +54,8 @@
     </button>
     <button
      follows="left|bottom"
-     height="20"
-     label="Block object by name..."
-     label_selected="Block object by name..."
+     height="23"
+     label="Block object by name"
      layout="topleft"
      left_delta="0"
      name="Block object by name..."
@@ -70,9 +68,8 @@
     <button
      enabled="false"
      follows="left|bottom"
-     height="20"
+     height="23"
      label="Unblock"
-     label_selected="Unblock"
      layout="topleft"
      left_delta="0"
      name="Unblock"
diff --git a/indra/newview/skins/default/xui/en/panel_friends.xml b/indra/newview/skins/default/xui/en/panel_friends.xml
index 3a35465df2..ac731bcdf0 100644
--- a/indra/newview/skins/default/xui/en/panel_friends.xml
+++ b/indra/newview/skins/default/xui/en/panel_friends.xml
@@ -8,7 +8,7 @@
  width="100">
     <panel.string
      name="Multiple">
-        Multiple friends...
+        Multiple friends
     </panel.string>
     <scroll_list
      bottom="337"
@@ -84,7 +84,7 @@
     <button
      follows="top|right"
      height="22"
-     label="Teleport..."
+     label="Teleport"
      layout="topleft"
      left_delta="0"
      name="offer_teleport_btn"
@@ -94,7 +94,7 @@
     <button
      follows="top|right"
      height="22"
-     label="Pay..."
+     label="Pay"
      layout="topleft"
      left_delta="0"
      name="pay_btn"
@@ -104,7 +104,7 @@
     <button
      follows="top|right"
      height="22"
-     label="Remove..."
+     label="Remove"
      layout="topleft"
      left_delta="0"
      name="remove_btn"
@@ -114,7 +114,7 @@
     <button
      follows="top|right"
      height="22"
-     label="Add..."
+     label="Add"
      layout="topleft"
      left_delta="0"
      name="add_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index 889f29fc53..a5445a5783 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  border="false"
- follows="left|top|right|bottom"
+ follows="all"
  height="238"
  name="panel_im_control_panel"
  width="180">
-
     <avatar_list
      color="DkGray2"
-     follows="left|top|right|bottom"
+     follows="all"
      height="100"
      ignore_online_status="true"
      layout="topleft"
@@ -19,20 +18,18 @@
      show_profile_btn="false"
      show_speaking_indicator="false"
      top="10"
-     width="180"/>
-
+     width="180" />
     <button
      bottom_pad="0"
-     follows="left|right|bottom" 
-     height="20"
-     label="Group Info"
+     follows="left|right|bottom"
+     height="23"
+     label="Group Profile"
      left_delta="28"
      name="group_info_btn"
-     width="125"/>
-
+     width="125" />
     <panel
      background_visible="true"
-     bg_alpha_color="0.2 0.2 0.2 1"
+     bg_alpha_color="DkGray2"
      border="false"
      follows="left|right|bottom"
      height="70"
@@ -41,34 +38,29 @@
      name="panel_call_buttons"
      top_pad="0"
      width="180">
-
         <button
          bottom="10"
-         follows="all" 
-         height="20"
+         follows="all"
+         height="23"
          label="Call Group"
          left_delta="28"
          name="call_btn"
-         width="125"/>
-
+         width="125" />
         <button
          bottom="40"
-         follows="all" 
-         height="20"
+         follows="all"
+         height="23"
          label="Leave Call"
          name="end_call_btn"
          visible="false"
-         width="125"/>
-
+         width="125" />
         <button
          bottom="10"
-         follows="all" 
-         height="20"
+         follows="all"
+         height="23"
          label="Open Voice Controls"
          name="voice_ctrls_btn"
          visible="false"
-         width="125"/>
-
+         width="125" />
     </panel>
-
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index 3c87331199..d51893793c 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -27,7 +27,7 @@
     <string
      name="no_partner_text"
      value="None" />
-    <string 
+    <string
 	 name="RegisterDateFormat">
 	 [REG_DATE] ([AGE])
 	</string>
@@ -156,8 +156,8 @@
                 Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
             </expandable_text>
         </panel>
-	
-	
+
+
 	<!-- <panel
        name="lifes_images_panel"
          follows="left|top|right"
@@ -207,10 +207,10 @@
            top="25"
            width="18" />
       </panel> -->
-	
-	
-	
-	
+
+
+
+
         <text
          type="string"
          follows="left|top"
@@ -254,7 +254,7 @@
          layout="topleft"
          left="10"
          name="register_date"
-         value="05/31/1976"
+         value="05/31/2376"
          width="280"
          word_wrap="true" />
         <text
@@ -351,11 +351,11 @@
      name="profile_buttons_panel"
      top_pad="2"
      bottom="10"
-     height="19"
+     height="23"
      width="303">
         <button
          follows="bottom|left"
-         height="19"
+         height="23"
          label="Add Friend"
          layout="topleft"
          left="0"
@@ -365,7 +365,7 @@
          width="75" />
         <button
          follows="bottom|left"
-         height="19"
+         height="23"
          label="IM"
          layout="topleft"
          name="im"
@@ -374,7 +374,7 @@
          width="45" />
         <button
          follows="bottom|left"
-         height="19"
+         height="23"
          label="Call"
          layout="topleft"
          name="call"
@@ -384,7 +384,7 @@
         <button
          enabled="false"
          follows="bottom|left"
-         height="19"
+         height="23"
          label="Map"
          layout="topleft"
          name="show_on_map_btn"
@@ -393,7 +393,7 @@
          width="45" />
         <button
          follows="bottom|left"
-         height="19"
+         height="23"
          label="Teleport"
          layout="topleft"
          name="teleport"
@@ -408,11 +408,11 @@
      top_pad="-17"
      name="profile_me_buttons_panel"
      visible="false"
-     height="19"
+     height="23"
      width="303">
         <button
          follows="bottom|right"
-         height="19"
+         height="23"
          left="10"
          label="Edit Profile"
          name="edit_profile_btn"
@@ -420,7 +420,7 @@
          width="130" />
         <button
          follows="bottom|right"
-         height="19"
+         height="23"
          label="Edit Appearance"
          left_pad="10"
          name="edit_appearance_btn"
-- 
cgit v1.2.3


From b290356d5d49848e885480e31c81304bdb029ab4 Mon Sep 17 00:00:00 2001
From: Lis Pardi <lis@lindenlab.com>
Date: Tue, 8 Dec 2009 13:35:27 -0500
Subject: EXT-2276 Advanced water settings floater sliders spaced too tight

---
 .../newview/skins/default/xui/en/floater_water.xml | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml
index b13a11c05d..89492d8abc 100644
--- a/indra/newview/skins/default/xui/en/floater_water.xml
+++ b/indra/newview/skins/default/xui/en/floater_water.xml
@@ -116,7 +116,7 @@
              layout="topleft"
              left="10"
              name="WaterFogDensText"
-             top="74"
+             top="84"
              width="200">
                 Fog Density Exponent
             </text>
@@ -130,7 +130,7 @@
              left="24"
              max_val="10"
              name="WaterFogDensity"
-             top="110"
+             top="124"
              width="200" />
             <text
              type="string"
@@ -141,7 +141,7 @@
              layout="topleft"
              left_delta="-14"
              name="WaterUnderWaterFogModText"
-             top_delta="4"
+             top="124"
              width="200">
                 Underwater Fog Modifier
             </text>
@@ -155,7 +155,7 @@
              left="24"
              max_val="2"
              name="WaterUnderWaterFogMod"
-             top="150"
+             top="164"
              width="200" />
             <text
              type="string"
@@ -180,7 +180,7 @@
              layout="topleft"
              max_val="10"
              name="WaterNormalScaleX"
-             top_pad="20"
+             top_pad="24"
              width="200" />
             <slider
              control_name="WaterNormalScaleY"
@@ -192,7 +192,7 @@
              layout="topleft"
              max_val="10"
              name="WaterNormalScaleY"
-             top_pad="0"
+             top_pad="4"
              width="200" />
             <slider
              control_name="WaterNormalScaleZ"
@@ -204,7 +204,7 @@
              layout="topleft"
              max_val="10"
              name="WaterNormalScaleZ"
-             top_pad="0"
+             top_pad="4"
              width="200" />
             <text
              type="string"
@@ -214,7 +214,7 @@
              height="16"
              layout="topleft"
              name="HDText"
-             top_pad="-10"
+             top="84"
              width="200">
                 Fresnel Scale
             </text>
@@ -227,7 +227,7 @@
              initial_value="0.7"
              layout="topleft"
              name="WaterFresnelScale"
-             top_pad="20"
+             top="124"
              width="200" />
             <text
              type="string"
@@ -237,7 +237,7 @@
              height="16"
              layout="topleft"
              name="FresnelOffsetText"
-             top_pad="-10"
+             top="124"
              width="200">
                 Fresnel Offset
             </text>
@@ -250,7 +250,7 @@
              initial_value="0.7"
              layout="topleft"
              name="WaterFresnelOffset"
-             top_pad="20"
+             top="164"
              width="200" />
             <text
              type="string"
@@ -275,7 +275,7 @@
              layout="topleft"
              left="494"
              name="WaterScaleAbove"
-             top="40"
+             top="44"
              width="200" />
             <text
              type="string"
@@ -286,7 +286,7 @@
              layout="topleft"
              left_delta="-14"
              name="WaterScaleBelowText"
-             top_delta="-3"
+             top="44"
              width="200">
                 Refract Scale Below
             </text>
@@ -300,7 +300,7 @@
              layout="topleft"
              left="494"
              name="WaterScaleBelow"
-             top="73"
+             top="84"
              width="200" />
             <text
              type="string"
@@ -311,7 +311,7 @@
              layout="topleft"
              left_delta="-14"
              name="MaxAltText"
-             top_delta="-2"
+             top="84"
              width="200">
                 Blur Multiplier
             </text>
@@ -325,7 +325,7 @@
              left="494"
              max_val="0.16"
              name="WaterBlurMult"
-             top="107"
+             top="124"
              width="200" />
         </panel>
         <panel
-- 
cgit v1.2.3


From 6711054c248fc0d5d53fe66021a074d38351afbf Mon Sep 17 00:00:00 2001
From: "Justin C. Rounds (Chuck)" <chuck@lindenlab.com>
Date: Tue, 8 Dec 2009 14:19:32 -0500
Subject: Added context menu items to the list from the avatar context menu.
 https://jira.secondlife.com/browse/EXT-2863

---
 .../skins/default/xui/en/menu_participant_list.xml | 61 ++++++++++++++++++++++
 1 file changed, 61 insertions(+)

(limited to 'indra/newview/skins')

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 c3283c6014..5ab327a182 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -2,6 +2,67 @@
 <context_menu
  layout="topleft"
  name="Participant List Context Menu">
+ <menu_item_call
+     label="View Profile"
+     layout="topleft"
+     name="View Profile">
+        <menu_item_call.on_click
+         function="Avatar.Profile" />
+    </menu_item_call>
+    <menu_item_call
+     label="Add Friend"
+     layout="topleft"
+     name="Add Friend">
+        <menu_item_call.on_click
+         function="Avatar.AddFriend" />
+        <menu_item_call.on_enable
+         function="Avatar.EnableItem"
+         parameter="can_add" />
+    </menu_item_call>
+    <menu_item_call
+     label="IM"
+     layout="topleft"
+     name="IM">
+        <menu_item_call.on_click
+         function="Avatar.IM" />
+    </menu_item_call>
+    <menu_item_call
+     label="Call"
+     layout="topleft"
+     name="Call">
+        <menu_item_call.on_click
+         function="Avatar.Call" />
+    </menu_item_call>
+    <menu_item_call
+     enabled="false"
+     label="Share"
+     layout="topleft"
+     name="Share">
+        <menu_item_call.on_click
+         function="Avatar.Share" />
+    </menu_item_call>
+    <menu_item_call
+     label="Pay"
+     layout="topleft"
+     name="Pay">
+        <menu_item_call.on_click
+         function="Avatar.Pay" />
+    </menu_item_call>
+    <menu_item_check
+     label="Block/Unblock"
+     layout="topleft"
+     name="Block/Unblock">
+        <menu_item_check.on_click
+         function="Avatar.BlockUnblock" />
+        <menu_item_check.on_check
+         function="Avatar.CheckItem"
+         parameter="is_blocked" />
+        <menu_item_check.on_enable
+         function="Avatar.EnableItem"
+         parameter="can_block" />
+    </menu_item_check>
+        <menu_item_separator
+         layout="topleft" />
     <menu_item_check
      label="Mute Text"
      layout="topleft"
-- 
cgit v1.2.3


From 2a21950a460ac63c7a42880f87980bc7daf3d28c Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Tue, 8 Dec 2009 11:49:40 -0800
Subject: L10N: the terminology 'Show Profile' is not to spec.  Make this
 consistent to 'View Profile' used everywhere else.

---
 indra/newview/skins/default/xui/en/menu_avatar_icon.xml   | 2 +-
 indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
index df510d68eb..50910dff32 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
@@ -9,7 +9,7 @@
  visible="false"
  width="128">
     <menu_item_call
-     label="Show Profile..."
+     label="View Profile"
      layout="topleft"
      name="Show Profile">
         <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml
index 6891aaca32..038b8328cb 100644
--- a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml
@@ -9,7 +9,7 @@
  visible="false"
  width="128">
     <menu_item_call
-     label="Show Profile"
+     label="View Profile"
      layout="topleft"
      name="Show Profile">
         <menu_item_call.on_click
-- 
cgit v1.2.3