From 5f851718505fdba77b1f7a6e47e4007e73747236 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 4 Jan 2010 13:58:42 -0800
Subject: EXT-3648 	 New message indicator on IM chiclets should be orange

---
 indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml | 2 +-
 indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml | 2 +-
 indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml   | 2 +-
 indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml    | 2 +-
 indra/newview/skins/default/xui/en/widgets/chiclet_script.xml   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
index 7cb973f4c8..af0d338256 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
@@ -33,7 +33,7 @@
     <chiclet_im_adhoc.new_message_icon
      bottom="12"
      height="13"
-     image_name="Unread_IM"
+     image_name="Unread_Chiclet"
      left="12"
      name="new_message_icon"
      visible="false"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
index a9b567225e..b1988a2d20 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
@@ -34,7 +34,7 @@
     <chiclet_im_group.new_message_icon
      bottom="12"
      height="13"
-     image_name="Unread_IM"
+     image_name="Unread_Chiclet"
      left="12"
      name="new_message_icon"
      visible="false"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
index 9283594a4c..52fbce0de7 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
@@ -33,7 +33,7 @@
     <chiclet_im_p2p.new_message_icon
      bottom="12"
      height="13"
-     image_name="Unread_IM"
+     image_name="Unread_Chiclet"
      left="12"
      name="new_message_icon"
      visible="false"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
index 5a22563758..33f85a964c 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
@@ -14,7 +14,7 @@
  <chiclet_offer.new_message_icon
   bottom="12"
   height="13"
-  image_name="Unread_IM"
+  image_name="Unread_Chiclet"
   left="12"
   name="new_message_icon"
   visible="false"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
index 05a23b95f9..560c8e6ea5 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
@@ -14,7 +14,7 @@
  <chiclet_script.new_message_icon
   bottom="12"
   height="13"
-  image_name="Unread_IM"
+  image_name="Unread_Chiclet"
   left="12"
   name="new_message_icon"
   visible="false"
-- 
cgit v1.2.3


From 0d14e65c2deb7b99d1459a75ee080f786850ceb0 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 4 Jan 2010 14:03:04 -0800
Subject: EXT-3721 	 SNAPSHOT PREVIEW can be dragged over the top menus

---
 indra/newview/skins/default/xui/en/main_view.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 65a545d2ed..ed06b91b18 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -121,6 +121,16 @@
                       tab_stop="false"
                       top="0"
                       width="1024"/>
+        <snapshot_floater_view enabled="false"
+                               follows="all"
+                               height="500"
+                               left="0"
+                               mouse_opaque="false"
+                               name="Snapshot Floater View"
+                               tab_stop="false"
+                               top="0"
+                               visible="false"
+                               width="1024"/>
       </panel>
       <debug_view follows="all"
                   left="0"
@@ -152,16 +162,6 @@
                mouse_opaque="false"
                name="Menu Holder"
                width="1024"/>
-  <snapshot_floater_view enabled="false"
-                         follows="all"
-                         height="768"
-                         left="0"
-                         mouse_opaque="false"
-                         name="Snapshot Floater View"
-                         tab_stop="false"
-                         top="0"
-                         visible="false"
-                         width="1024"/>
   <tooltip_view top="0"
                 follows="all"
                 height="768"
-- 
cgit v1.2.3


From fbac3aaf0c43de4892ab0b95540f86c2b7c7a0de Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 4 Jan 2010 14:04:20 -0800
Subject: EXT-2481 	 [BSI] Add "Zoom in" to 3D Object context menu and
 inspector Gear menu EXT-3388 	 [BSI] "Teleport" option missing dropdown when
 right clicking on friends list

---
 indra/newview/skins/default/xui/en/menu_avatar_other.xml | 6 ++++++
 indra/newview/skins/default/xui/en/menu_object.xml       | 6 ++++++
 2 files changed, 12 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index 0ad41546d2..78f057a7d7 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -93,4 +93,10 @@
         <menu_item_call.on_enable
          function="EnablePayAvatar" />
     </menu_item_call>
+  <menu_item_call
+  label="Offer Teleport"
+  name="teleport">
+    <menu_item_call.on_click
+     function="Avatar.Teleport"/>
+  </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 62500c5116..35518cd13b 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -57,6 +57,12 @@
          <menu_item_call.on_enable
           function="Object.EnableInspect" />
    </menu_item_call>
+  <menu_item_call
+       label="Zoom In"
+       name="Zoom In">
+    <menu_item_call.on_click
+     function="Object.ZoomIn" />
+  </menu_item_call>
 <menu_item_separator layout="topleft" />
    <context_menu
          label="Put On &gt;"
-- 
cgit v1.2.3


From fd8e1ea53586f6e7065baa143608102804882c9a Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 4 Jan 2010 14:36:04 -0800
Subject: moving this menu item to the right place EXT-3388 	 [BSI]
 "Teleport" option missing dropdown when right clicking on friends list

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index 78f057a7d7..0ad41546d2 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -93,10 +93,4 @@
         <menu_item_call.on_enable
          function="EnablePayAvatar" />
     </menu_item_call>
-  <menu_item_call
-  label="Offer Teleport"
-  name="teleport">
-    <menu_item_call.on_click
-     function="Avatar.Teleport"/>
-  </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index 5f2e6e0f6c..c4da1df017 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -63,4 +63,10 @@
          function="Avatar.EnableItem"
          parameter="can_block" />
     </menu_item_check>
+    <menu_item_call
+    label="Offer Teleport"
+    name="teleport">
+      <menu_item_call.on_click
+       function="Avatar.OfferTeleport"/>
+    </menu_item_call>
 </context_menu>
-- 
cgit v1.2.3


From 6064d8a22645596f0bf5e944200f314f0c03e8d8 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 4 Jan 2010 15:02:24 -0800
Subject: Backed out changeset: 9edc40cf0ac6

---
 indra/newview/skins/default/xui/en/main_view.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index ed06b91b18..65a545d2ed 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -121,16 +121,6 @@
                       tab_stop="false"
                       top="0"
                       width="1024"/>
-        <snapshot_floater_view enabled="false"
-                               follows="all"
-                               height="500"
-                               left="0"
-                               mouse_opaque="false"
-                               name="Snapshot Floater View"
-                               tab_stop="false"
-                               top="0"
-                               visible="false"
-                               width="1024"/>
       </panel>
       <debug_view follows="all"
                   left="0"
@@ -162,6 +152,16 @@
                mouse_opaque="false"
                name="Menu Holder"
                width="1024"/>
+  <snapshot_floater_view enabled="false"
+                         follows="all"
+                         height="768"
+                         left="0"
+                         mouse_opaque="false"
+                         name="Snapshot Floater View"
+                         tab_stop="false"
+                         top="0"
+                         visible="false"
+                         width="1024"/>
   <tooltip_view top="0"
                 follows="all"
                 height="768"
-- 
cgit v1.2.3


From 60377f1ae358f4407d051022f391dbeeee00c574 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Mon, 4 Jan 2010 16:39:59 -0800
Subject: EXT-3932 Pay Resident via Object - text overlaps edge

---
 .../skins/default/xui/en/floater_pay_object.xml    | 31 +++++++++++-----------
 .../newview/skins/default/xui/en/floater_tools.xml |  2 +-
 2 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_pay_object.xml b/indra/newview/skins/default/xui/en/floater_pay_object.xml
index 1946920a9c..455018f467 100644
--- a/indra/newview/skins/default/xui/en/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_pay_object.xml
@@ -30,25 +30,25 @@
      type="string"
      length="1"
      follows="left|top"
-     font="SansSerif"
      height="16"
      layout="topleft"
      left_pad="7"
+     top_delta="3"
      name="payee_name"
-     width="210">
-        [FIRST] [LAST]
+     width="184">
+      Ericacita Moostopolison
     </text>
     <text
      type="string"
      length="1"
      follows="left|top"
      halign="left"
-     height="16"
+     height="14"
      layout="topleft"
-     left="30"
+     left="34"
      name="object_name_label"
      top_pad="0"
-     width="150">
+     width="180">
         Via object:
     </text>
    <icon
@@ -59,20 +59,21 @@
      name="icon_object"
      tool_tip="Objects"
      top_pad="0"
-     left="30"
+     left="10"
      />
     <text
      type="string"
      length="1"
      follows="left|top"
-     font="SansSerif"
-     height="18"
+     height="16"
      layout="topleft"
-     left_pad="5"
+     left_pad="7"
      name="object_name_text"
-     top_delta="0"
-     width="210">
-        ...
+     top_delta="3"
+     use_ellipses="true"
+     word_wrap="false"
+     width="188">
+        My awesome object with a really damn long name
     </text>
    <button
      height="23"
@@ -112,7 +113,7 @@
      type="string"
      length="1"
      follows="left|top"
-     height="18"
+     height="14"
      layout="topleft"
      left="25"
      name="amount text"
@@ -123,7 +124,7 @@
     <line_editor
      border_style="line"
      follows="left|top|right"
-     height="19"
+     height="21"
      top_pad="0"
      layout="topleft"
      left="120"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index e55453f772..a1e190fc5e 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2675,7 +2675,7 @@ even though the user gets a free copy.
 			 height="18"
 			 layout="topleft"
 			 left="10"
-       use_ellipsis="true" 
+                         use_ellipses="true"
 			 read_only="true"
 			 name="media_info"
 			 width="180" />
-- 
cgit v1.2.3


From 0e3445a8c2eede3e98b6b1316e8d0e157661fb81 Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Tue, 5 Jan 2010 14:47:42 -0500
Subject: ext-3914 [BSI] Inconsistent terminology for "notecard"

---
 indra/newview/skins/default/xui/en/floater_preview_notecard.xml | 6 +++---
 indra/newview/skins/default/xui/en/menu_inventory.xml           | 2 +-
 indra/newview/skins/default/xui/en/menu_inventory_add.xml       | 2 +-
 indra/newview/skins/default/xui/en/panel_main_inventory.xml     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index 06dbdc9539..ead5b8c8f2 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -11,15 +11,15 @@
  min_width="234"
  name="preview notecard"
  help_topic="preview_notecard"
- title="NOTE:"
+ title="NOTECARD:"
  width="400">
     <floater.string
      name="no_object">
-        Unable to find object containing this note.
+        Unable to find object containing this notecard.
     </floater.string>
     <floater.string
      name="not_allowed">
-        You do not have permission to view this note.
+        You do not have permission to view this notecard.
     </floater.string>
     <floater.string
      name="Title">
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index d29dfa7034..1e10467148 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -85,7 +85,7 @@
          parameter="lsl" />
     </menu_item_call>
     <menu_item_call
-     label="New Note"
+     label="New Notecard"
      layout="topleft"
      name="New Note">
         <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index b07a8bb512..5ad099e2d9 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -71,7 +71,7 @@
                  parameter="lsl" />
             </menu_item_call>
             <menu_item_call
-             label="New Note"
+             label="New Notecard"
              layout="topleft"
              name="New Note">
                 <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 4353b306cd..d7792696e7 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -262,7 +262,7 @@ halign="center"
                  parameter="lsl" />
             </menu_item_call>
             <menu_item_call
-             label="New Note"
+             label="New Notecard"
              layout="topleft"
              name="New Note">
                 <menu_item_call.on_click
-- 
cgit v1.2.3


From 41b7ea6c87117a0558c3c8794e008b79d9e5e5da Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Tue, 5 Jan 2010 15:52:13 -0500
Subject: ext-3863 [BSI] banned resident list slider is cutoff

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index cc955369e2..31e322b952 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -2022,7 +2022,7 @@ Only large parcels can be listed in search.
              multi_select="true"
              name="AccessList"
              tool_tip="([LISTED] listed, [MAX] max)"
-             width="240" />
+             width="230" />
             <button
              follows="bottom"
              height="23"
@@ -2047,7 +2047,7 @@ Only large parcels can be listed in search.
             follows="top|right"
             height="170"
             width="240"
-            left_pad="8">
+            left_pad="2">
             <text
              type="string"
              length="1"
@@ -2071,7 +2071,7 @@ Only large parcels can be listed in search.
              multi_select="true"
              name="BannedList"
              tool_tip="([LISTED] listed, [MAX] max)"
-             width="240" />
+             width="230" />
             <button
              follows="bottom"
              height="23"
-- 
cgit v1.2.3


From 7ec938e08da03d7029abc96c5cc0f5a7b8d683ca Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Tue, 5 Jan 2010 16:10:35 -0500
Subject: ext-3950 Top menu World : Buy Land should read "Buy This Land"

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 4e495bab3f..58e9d39807 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -307,7 +307,7 @@
         <menu_item_separator
          layout="topleft" />
         <menu_item_call
-             label="Buy Land"
+             label="Buy This Land"
              layout="topleft"
              name="Buy Land">
                 <menu_item_call.on_click
-- 
cgit v1.2.3


From 8661506f296824f2b36df79cebad0c40d2137daf Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Tue, 5 Jan 2010 17:06:48 -0500
Subject: ext-3936 [BSI] About Land -> Name -> Text not Centered

---
 .../skins/default/xui/en/floater_about_land.xml    | 29 +++++++++++-----------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 31e322b952..377ef9fc28 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -110,7 +110,7 @@
             </text>
             <line_editor
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
              left_pad="2"
              max_length="63"
@@ -145,7 +145,7 @@
              layout="topleft"
              left="10"
              name="LandType"
-             top="84"
+             top_pad="5"
              width="100">
                 Type:
             </text>
@@ -192,7 +192,7 @@
              layout="topleft"
              left="10"
              name="Owner:"
-             top="124"
+             top_pad="5"
              width="100">
                 Owner:
             </text>
@@ -202,7 +202,7 @@
              follows="left|top"
              height="16"
              layout="topleft"
-             left_pad="5"
+             left_pad="3"
              name="OwnerText"
              width="240">
                 Leyla Linden
@@ -270,7 +270,7 @@
              left="96"
              name="check deed"
              tool_tip="A group officer can deed this land to the group, so it will be supported by the group&apos;s land allocation."
-             top="164"
+             top_pad="3"
              width="146" />
             <button
              enabled="false"
@@ -352,7 +352,7 @@
              layout="topleft"
              left_delta="-199"
              name="For sale to"
-             top_delta="6"
+             top_delta="2"
              width="186">
                 For sale to: [BUYER]
             </text>
@@ -364,7 +364,7 @@
              layout="topleft"
              left_delta="0"
              name="Sell with landowners objects in parcel."
-             top_pad="8"
+             top_pad="0"
              width="186">
                 Objects included in sale
             </text>
@@ -389,6 +389,7 @@
              right="-10"
              name="Cancel Land Sale"
              left_pad="5"
+             top_pad="-10"
              width="145" />
             <text
              type="string"
@@ -422,7 +423,7 @@
              layout="topleft"
              left="10"
              name="PriceLabel"
-             top="288"
+             top_pad="5"
              width="100">
                 Area:
             </text>
@@ -470,7 +471,7 @@
              layout="topleft"
              left_delta="82"
              name="Buy Land..."
-             top="328"
+             top_pad="5"
              width="100" />
             <button
              enabled="true"
@@ -480,7 +481,7 @@
              layout="topleft"
              left="10"
              name="Scripts..."
-             top="352"
+             top_pad="1"
              width="100" />
             <button
              enabled="false"
@@ -490,7 +491,7 @@
              layout="topleft"
              right="-10"
              name="Buy For Group..."
-             top="352"
+             top_delta="0"
              width="180" />
             <button
              enabled="false"
@@ -510,7 +511,7 @@
              layout="topleft"
              right="-10"
              name="Abandon Land..."
-             top="328"
+             top_pad="-47"
              width="180" />
             <button
              follows="left|top"
@@ -519,7 +520,7 @@
              layout="topleft"
              left_delta="0"
              name="Reclaim Land..."
-             top_delta="-50"
+             top_delta="-48"
              width="180" />
             <button
              enabled="false"
@@ -530,7 +531,7 @@
              left_delta="0"
              name="Linden Sale..."
              tool_tip="Land must be owned, set content, and not already for auction."
-             top_pad="4"
+             top_pad="2"
              width="180" />
         </panel>
         <panel
-- 
cgit v1.2.3


From e86fb0df6b680830bead2d07e01c4dc3935d179b Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Tue, 5 Jan 2010 17:24:24 -0500
Subject: ext-3936 [BSI] About Land -> Name -> Text  not centered

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 377ef9fc28..33fdd923ad 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -202,7 +202,7 @@
              follows="left|top"
              height="16"
              layout="topleft"
-             left_pad="3"
+             left_pad="2"
              name="OwnerText"
              width="240">
                 Leyla Linden
@@ -232,6 +232,7 @@
              layout="topleft"
              left="10"
              name="Group:"
+             top_pad="7"
              width="100">
                 Group:
             </text>
@@ -240,10 +241,11 @@
              enabled="false"
              follows="left|top"
              height="16"
-             left_pad="5"
+             left_pad="2"
              layout="topleft"
              name="GroupText"
-             width="240" />
+             width="240">
+Leyla Linden               </text>
                  <button
      follows="right"
      height="16"
@@ -267,7 +269,7 @@
              height="23"
              label="Allow Deed to Group"
              layout="topleft"
-             left="96"
+             left="108"
              name="check deed"
              tool_tip="A group officer can deed this land to the group, so it will be supported by the group&apos;s land allocation."
              top_pad="3"
@@ -289,7 +291,7 @@
              height="16"
              label="Owner Makes Contribution With Deed"
              layout="topleft"
-             left="96"
+             left="108"
              name="check contrib"
              tool_tip="When the land is deeded to the group, the former owner contributes enough land allocation to support it."
              width="199" />
@@ -471,7 +473,7 @@
              layout="topleft"
              left_delta="82"
              name="Buy Land..."
-             top_pad="5"
+             top_pad="7"
              width="100" />
             <button
              enabled="true"
-- 
cgit v1.2.3


From b9b61431c580a33f909a452ebe68ce9407136ea2 Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Tue, 5 Jan 2010 17:40:10 -0500
Subject: ext-3822 Group, Roles, Members: "Assigned Members" should be
 "Assigned Roles"

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

(limited to 'indra/newview/skins/default/xui')

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 9548119d58..a5bab3232c 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -258,7 +258,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          name="static"
          top_pad="5"
          width="300">
-            Assigned Members
+            Assigned Roles
         </text>
         <scroll_list
          draw_stripes="true"
-- 
cgit v1.2.3


From 6fd776bf99f751a5821e31b037fdd1875eff5641 Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Tue, 5 Jan 2010 17:49:34 -0500
Subject: ext-3943 Group Call button (on side panel/People/Groups) does not fit
 in SL window

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 08a10553a8..adf22f825f 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -400,7 +400,7 @@ background_visible="true"
          layout="topleft"
          name="group_info_btn"
          tool_tip="Show group information"
-         width="110" />
+         width="102" />
         <button
          follows="bottom|left"
          top="4"
@@ -410,7 +410,7 @@ background_visible="true"
          layout="topleft"
          name="chat_btn"
          tool_tip="Open chat session"
-         width="110" />
+         width="102" />
         <button
          follows="bottom|left"
          top="4"
@@ -420,6 +420,6 @@ background_visible="true"
          layout="topleft"
          name="group_call_btn"
          tool_tip="Call this group"
-         width="110" />
+         width="102" />
     </panel>
 </panel>
-- 
cgit v1.2.3


From abf2df530f2a491f71204edd0fe39db1b70258ae Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Tue, 5 Jan 2010 15:19:13 -0800
Subject: EXT-3884 [BSI] group list cut off when there is room to display more
 - made room for more groups, but list is sent as a comma delmited string from
 server. Requires code change to list one per line.

---
 .../skins/default/xui/en/panel_my_profile.xml      | 146 ++++++---------------
 1 file changed, 39 insertions(+), 107 deletions(-)

(limited to 'indra/newview/skins/default/xui')

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 10381d3987..d8726a07e2 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -34,7 +34,7 @@
     <scroll_container
      color="DkGray2"
      follows="all"
-     height="485"
+     height="500"
      layout="topleft"
      name="profile_scroll"
      reserve_scroll_corner="false"
@@ -44,7 +44,7 @@
       <panel
          name="scroll_content_panel"
          follows="left|top|right"
-          height="485"
+          height="500"
          layout="topleft"
          top="0"
          left="0"
@@ -56,7 +56,7 @@
          left="10"
          name="second_life_image_panel"
          top="0"
-         width="280">
+         width="300">
             <texture_picker
              allow_no_texture="true"
              default_image_name="None"
@@ -88,7 +88,7 @@
              text_color="white"
              top_delta="0"
              value="[SECOND_LIFE]:"
-             width="165" />
+             width="180" />
             <expandable_text
              follows="left|top|right"
              height="95"
@@ -97,7 +97,7 @@
              textbox.max_length="512"
              name="sl_description_edit"
              top_pad="-3"
-             width="173"
+             width="188"
              expanded_bg_visible="true"
              expanded_bg_color="DkGray">
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
@@ -110,7 +110,7 @@
 	     top_pad="10"
          left="10"
          name="first_life_image_panel"
-         width="280">
+         width="300">
             <texture_picker
              allow_no_texture="true"
              default_image_name="None"
@@ -141,7 +141,7 @@
              text_color="white"
              top_delta="0"
              value="Real World:"
-             width="165" />
+             width="180" />
             <expandable_text
              follows="left|top|right"
              height="95"
@@ -150,90 +150,23 @@
              textbox.max_length="512"
              name="fl_description_edit"
              top_pad="-3"
-             width="173"
+             width="188"
              expanded_bg_visible="true"
              expanded_bg_color="DkGray">
                 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"
-         height="244"
-         layout="topleft"
-         top="0"
-         left="0"
-         width="285">
-	 <panel
-         follows="left|top"
-         height="117"
-         layout="topleft"
-         left="10"
-         name="second_life_image_panel"
-         top="0"
-         width="285">
-          <text
-             follows="left|top|right"
-	     font.style="BOLD"
-             height="15"
-             layout="topleft"
-             left="0"
-            name="second_life_photo_title_text"
-             text_color="white"
-             value="[SECOND_LIFE]:"
-             width="170" />
-            <texture_picker
-             allow_no_texture="true"
-             default_image_name="None"
-             enabled="false"
-             follows="top|left"
-             height="117"
-             layout="topleft"
-             left="0"
-             name="2nd_life_pic"
-             top_pad="0"
-             width="102" />
-          </panel>
-           <icon
-           height="18"
-           image_name="AddItem_Off"
-           layout="topleft"
-           name="2nd_life_edit_icon"
-           label=""
-           left="87"
-           tool_tip="Click to select an image"
-           top="25"
-           width="18" />
-      </panel> -->
-
-
-
-
-        <text
-         type="string"
-         follows="left|top"
-         font="SansSerifSmall"
-	     font.style="BOLD"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="me_homepage_text"
-         text_color="white"
-         top_pad="0"
-         width="280">
-             Homepage:
-        </text>
         <text
          follows="left|top"
          height="15"
+	 font.style="BOLD"
+	 font="SansSerifMedium"
          layout="topleft"
          left="10"
          name="homepage_edit"
          top_pad="0"
          value="http://librarianavengers.org"
-         width="280"
+         width="300"
          word_wrap="false"
          use_ellipses="true"
          />
@@ -246,8 +179,8 @@
          name="title_member_text"
          text_color="white"
          top_pad="10"
-         value="Member Since:"
-         width="280" />
+         value="Resident Since:"
+         width="300" />
         <text
          follows="left|top"
          height="15"
@@ -255,7 +188,7 @@
          left="10"
          name="register_date"
          value="05/31/2376"
-         width="280"
+         width="300"
          word_wrap="true" />
         <text
          follows="left|top"
@@ -265,9 +198,9 @@
          left="10"
          name="title_acc_status_text"
          text_color="white"
-         top_pad="10"
+         top_pad="5"
          value="Account Status:"
-         width="280" />
+         width="300" />
        <!-- <text
          type="string"
          follows="left|top"
@@ -287,7 +220,7 @@
          name="acc_status_text"
          top_pad="0"
          value="Resident. No payment info on file."
-         width="280"
+         width="300"
          word_wrap="true" />
         <text
          follows="left|top"
@@ -297,9 +230,9 @@
          left="10"
          name="title_partner_text"
          text_color="white"
-         top_pad="5"
+         top_pad="3"
          value="Partner:"
-         width="280" />
+         width="300" />
         <panel
          follows="left|top"
          height="15"
@@ -307,7 +240,7 @@
          left="10"
          name="partner_data_panel"
          top_pad="0"
-         width="280">
+         width="300">
             <text
              follows="left|top"
              height="10"
@@ -316,31 +249,31 @@
              name="partner_text"
              top="0"
              value="[FIRST] [LAST]"
-         width="280"
+         width="300"
              word_wrap="true" />
          </panel>
         <text
          follows="left|top"
 	 font.style="BOLD"
-         height="15"
+         height="13"
          layout="topleft"
          left="10"
          name="title_groups_text"
          text_color="white"
-         top_pad="8"
+         top_pad="3"
          value="Groups:"
-         width="280" />
-                     <expandable_text
+         width="300" />
+         <expandable_text
          follows="left|top|bottom"
-         height="60"
+         height="115"
          layout="topleft"
-         left="10"
-             name="sl_groups"
+         left="7"
+         name="sl_groups"
        top_pad="0"
-         width="280"
-             expanded_bg_visible="true"
-             expanded_bg_color="DkGray">
-            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.
+         width="300"
+         expanded_bg_visible="true"
+         expanded_bg_color="DkGray">
+            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. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
         </expandable_text>
       </panel>
  </scroll_container>
@@ -350,7 +283,6 @@
      left="0"
      name="profile_buttons_panel"
      top_pad="2"
-     bottom="10"
      height="23"
      width="303">
         <button
@@ -362,7 +294,7 @@
          mouse_opaque="false"
          name="add_friend"
          top="5"
-         width="75" />
+         width="80" />
         <button
          follows="bottom|left"
          height="23"
@@ -370,7 +302,7 @@
          layout="topleft"
          name="im"
          top="5"
-         left_pad="5"
+         left_pad="3"
          width="45" />
         <button
          follows="bottom|left"
@@ -378,7 +310,7 @@
          label="Call"
          layout="topleft"
          name="call"
-         left_pad="5"
+         left_pad="3"
          top="5"
          width="45" />
         <button
@@ -389,7 +321,7 @@
          layout="topleft"
          name="show_on_map_btn"
          top="5"
-         left_pad="5"
+         left_pad="3"
          width="45" />
         <button
          follows="bottom|left"
@@ -397,15 +329,15 @@
          label="Teleport"
          layout="topleft"
          name="teleport"
-         left_pad="5"
+         left_pad="3"
          top="5"
-         width="80" />
+         width="85" />
  </panel>
  <panel
      follows="bottom|left"
      layout="topleft"
      left="0"
-     top_pad="-17"
+     top_pad="-2"
      name="profile_me_buttons_panel"
      visible="false"
      height="23"
-- 
cgit v1.2.3


From 3fa03a6ccabd6c16c9023a55f98177614e06f2d8 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Tue, 5 Jan 2010 15:41:13 -0800
Subject: EXT-3884 [BSI] group list cut off when there is room to display more
 - made room for more groups, but list is sent as a comma delmited string from
 server. Requires code change to list one per line.

---
 .../skins/default/xui/en/panel_my_profile.xml      |  23 ++--
 .../newview/skins/default/xui/en/panel_profile.xml | 128 ++++++++++-----------
 2 files changed, 70 insertions(+), 81 deletions(-)

(limited to 'indra/newview/skins/default/xui')

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 d8726a07e2..ffc568281e 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -43,14 +43,14 @@
      width="313">
       <panel
          name="scroll_content_panel"
-         follows="left|top|right"
+         follows="all"
           height="500"
          layout="topleft"
          top="0"
          left="0"
-         width="297">
-	  <panel
-         follows="left|top"
+         width="313">
+	 <panel
+         follows="left|top|right"
          height="117"
          layout="topleft"
          left="10"
@@ -80,7 +80,7 @@
            width="102" />
             <text
              follows="left|top|right"
-	         font.style="BOLD"
+	     font.style="BOLD"
              height="15"
              layout="topleft"
              left_pad="10"
@@ -104,10 +104,10 @@
             </expandable_text>
         </panel>
         <panel
-         follows="left|top"
+         follows="left|top|right"
          height="117"
          layout="topleft"
-	     top_pad="10"
+	 top_pad="10"
          left="10"
          name="first_life_image_panel"
          width="300">
@@ -133,7 +133,7 @@
            width="102" />
             <text
              follows="left|top|right"
-	         font.style="BOLD"
+	     font.style="BOLD"
              height="15"
              layout="topleft"
              left_pad="10"
@@ -264,7 +264,7 @@
          value="Groups:"
          width="300" />
          <expandable_text
-         follows="left|top|bottom"
+         follows="all"
          height="115"
          layout="topleft"
          left="7"
@@ -285,7 +285,7 @@
      top_pad="2"
      height="23"
      width="303">
-        <button
+         <button
          follows="bottom|left"
          height="23"
          label="Add Friend"
@@ -293,6 +293,7 @@
          left="0"
          mouse_opaque="false"
          name="add_friend"
+         tool_tip="Offer friendship to the resident"
          top="5"
          width="80" />
         <button
@@ -337,7 +338,7 @@
      follows="bottom|left"
      layout="topleft"
      left="0"
-     top_pad="-2"
+     top_pad="-22"
      name="profile_me_buttons_panel"
      visible="false"
      height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 342cf4144f..bf592535f5 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -27,42 +27,42 @@
     <string
      name="no_partner_text"
      value="None" />
-    <string 
+    <string
 	 name="RegisterDateFormat">
 	 [REG_DATE] ([AGE])
 	</string>
   <scroll_container
      color="DkGray2"
      follows="all"
-     height="485"
+     height="500"
      layout="topleft"
      name="profile_scroll"
-     reserve_scroll_corner="true"
+     reserve_scroll_corner="false"
      opaque="true"
      top="0"
      width="313">
       <panel
          name="scroll_content_panel"
-         follows="left|top|right"
-          height="485"
+         follows="all"
+          height="500"
          layout="topleft"
          top="0"
          left="0"
          width="313">
 	 <panel
-         follows="left|top"
+         follows="left|top|right"
          height="117"
          layout="topleft"
          left="10"
          name="second_life_image_panel"
          top="0"
-         width="280">
+         width="300">
             <texture_picker
              allow_no_texture="true"
              default_image_name="None"
              enabled="false"
              follows="top|left"
-             height="102"
+             height="117"
              layout="topleft"
              left="0"
              name="2nd_life_pic"
@@ -78,7 +78,7 @@
              text_color="white"
              top_delta="0"
              value="[SECOND_LIFE]:"
-             width="165" />
+             width="180" />
             <expandable_text
              follows="left|top|right"
              height="95"
@@ -87,26 +87,26 @@
              textbox.max_length="512"
              name="sl_description_edit"
              top_pad="-3"
-             width="173"
+             width="188"
              expanded_bg_visible="true"
              expanded_bg_color="DkGray">
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
             </expandable_text>
         </panel>
         <panel
-         follows="left|top"
+         follows="left|top|right"
          height="117"
          layout="topleft"
 	 top_pad="10"
          left="10"
          name="first_life_image_panel"
-         width="280">
+         width="300">
             <texture_picker
              allow_no_texture="true"
              default_image_name="None"
              enabled="false"
              follows="top|left"
-             height="102"
+             height="117"
              layout="topleft"
              left="0"
              name="real_world_pic"
@@ -121,7 +121,7 @@
              text_color="white"
              top_delta="0"
              value="Real World:"
-             width="165" />
+             width="180" />
             <expandable_text
              follows="left|top|right"
              height="95"
@@ -130,57 +130,45 @@
              textbox.max_length="512"
              name="fl_description_edit"
              top_pad="-3"
-             width="173"
+             width="188"
              expanded_bg_visible="true"
              expanded_bg_color="DkGray">
                 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>
-        <text
-         type="string"
-         follows="left|top"
-         font="SansSerifSmall"
-	 font.style="BOLD"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="me_homepage_text"
-         text_color="white"
-         top_pad="0"
-         width="280">
-             Homepage:
-        </text>
-        <text
+       <text
          follows="left|top"
          height="15"
+	 font.style="BOLD"
+	 font="SansSerifMedium"
          layout="topleft"
          left="10"
          name="homepage_edit"
          top_pad="0"
          value="http://librarianavengers.org"
-         width="280"
+         width="300"
          word_wrap="false"
          use_ellipses="true"
          />
         <text
          follows="left|top"
-	 font.style="BOLD"
+	     font.style="BOLD"
          height="10"
          layout="topleft"
          left="10"
          name="title_member_text"
          text_color="white"
          top_pad="10"
-         value="Member Since:"
-         width="280" />
+         value="Resident Since:"
+         width="300" />
         <text
          follows="left|top"
          height="15"
          layout="topleft"
          left="10"
          name="register_date"
-         value="05/31/1976"
-         width="280"
+         value="05/31/2376"
+         width="300"
          word_wrap="true" />
         <text
          follows="left|top"
@@ -190,9 +178,9 @@
          left="10"
          name="title_acc_status_text"
          text_color="white"
-         top_pad="10"
+         top_pad="5"
          value="Account Status:"
-         width="280" />
+         width="300" />
        <!-- <text
          type="string"
          follows="left|top"
@@ -212,7 +200,7 @@
          name="acc_status_text"
          top_pad="0"
          value="Resident. No payment info on file."
-         width="280"
+         width="300"
          word_wrap="true" />
         <text
          follows="left|top"
@@ -222,9 +210,9 @@
          left="10"
          name="title_partner_text"
          text_color="white"
-         top_pad="5"
+         top_pad="3"
          value="Partner:"
-         width="280" />
+         width="300" />
         <panel
          follows="left|top"
          height="15"
@@ -232,7 +220,7 @@
          left="10"
          name="partner_data_panel"
          top_pad="0"
-         width="280">
+         width="300">
             <text
              follows="left|top"
              height="10"
@@ -241,31 +229,31 @@
              name="partner_text"
              top="0"
              value="[FIRST] [LAST]"
-         width="280"
+         width="300"
              word_wrap="true" />
          </panel>
         <text
          follows="left|top"
 	 font.style="BOLD"
-         height="15"
+         height="13"
          layout="topleft"
          left="10"
          name="title_groups_text"
          text_color="white"
-         top_pad="8"
+         top_pad="3"
          value="Groups:"
-         width="280" />
-                     <expandable_text
-         follows="left|top|bottom"
-         height="60"
+         width="300" />
+         <expandable_text
+         follows="all"
+         height="115"
          layout="topleft"
-         left="10"
-             name="sl_groups"
+         left="7"
+         name="sl_groups"
        top_pad="0"
-         width="280"
-             expanded_bg_visible="true"
-             expanded_bg_color="DkGray">
-            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.
+         width="300"
+         expanded_bg_visible="true"
+         expanded_bg_color="DkGray">
+            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. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
         </expandable_text>
       </panel>
  </scroll_container>
@@ -275,8 +263,7 @@
      left="0"
      name="profile_buttons_panel"
      top_pad="2"
-     bottom="0"
-     height="19"
+     height="23"
      width="303">
         <button
          follows="bottom|left"
@@ -288,7 +275,7 @@
          name="add_friend"
          tool_tip="Offer friendship to the resident"
          top="5"
-         width="77" />
+         width="80" />
         <button
          follows="bottom|left"
          height="23"
@@ -297,8 +284,8 @@
          name="im"
          tool_tip="Open instant message session"
          top="5"
-         left_pad="5"
-         width="33" />
+         left_pad="3"
+         width="45" />
         <button
          follows="bottom|left"
          height="23"
@@ -306,9 +293,9 @@
          layout="topleft"
          name="call"
          tool_tip="Call this resident"
-         left_pad="5"
+         left_pad="3"
          top="5"
-         width="40" />
+         width="45" />
         <button
          enabled="false"
          follows="bottom|left"
@@ -318,8 +305,8 @@
          name="show_on_map_btn"
          tool_tip="Show the resident on the map"
          top="5"
-         left_pad="5"
-         width="44" />
+         left_pad="3"
+         width="45" />
         <button
          follows="bottom|left"
          height="23"
@@ -327,10 +314,10 @@
          layout="topleft"
          name="teleport"
          tool_tip="Offer teleport"
-         left_pad="5"
+         left_pad="3"
          top="5"
-         width="67" />
-        <button
+         width="85" />
+       <!-- <button
          follows="bottom|right"
          height="23"
          label="▼"
@@ -339,16 +326,17 @@
          tool_tip="Pay money to or share inventory with the resident"
          right="-1"
          top="5"
-         width="21" />
+	 left_pad="3"
+         width="23" />-->
  </panel>
  <panel
      follows="bottom|left"
      layout="topleft"
      left="0"
-     top_pad="-17"
+     top_pad="-22"
      name="profile_me_buttons_panel"
      visible="false"
-     height="19"
+     height="23"
      width="303">
         <button
          follows="bottom|right"
-- 
cgit v1.2.3


From a3adfe54cb9fc953cae0adf2f61c578aa3ca5842 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 5 Jan 2010 16:28:22 -0800
Subject: EXT-3332 Disabled checkboxes don't use disabled text color Text label
 color wasn't being set in constructor. Added example to
 floater_test_widgets.xml Reviewed with Richard

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
index 84adabe4fa..2f88c234cc 100644
--- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
@@ -123,6 +123,12 @@
    layout="topleft"
    tool_tip="checkbox"
    name="test_checkbox" />
+  <check_box
+   top_pad="5"
+   enabled="false" 
+   label="Checkbox Disabled"
+   tool_tip="checkbox disabled"
+   name="test_checkbox_disabled" />
   <!-- "combo_box" is a pop-menu of items.  Optionally the box itself can
        contain a general purpose line input editor, allowing the user to
        provide input that is not a list item. -->
-- 
cgit v1.2.3


From 3892cdd32cd304bbee8def14ab0d9703299cf2f2 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 5 Jan 2010 17:59:07 -0800
Subject: EXT-2006 Fix mini-map friend icon colors to be yellow XML only not
 reviewed

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index b92aa10ffc..aeaa049f1f 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -350,7 +350,7 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
              -->
                 <button
                  auto_resize="true"
-                 flash_color="Yellow"
+                 flash_color="ChicletFlashColor"
                  follows="right"
                  halign="center"
                  height="23"
@@ -403,7 +403,7 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                halign="center"
                height="23"
                follows="right"
-               flash_color="Yellow"
+               flash_color="ChicletFlashColor"
                 label_color="Black"
                left="5"
                name="Unread"
-- 
cgit v1.2.3


From d2aabf2b1fb80b9bf6b950b9b3b2298f29098a90 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Tue, 5 Jan 2010 19:14:09 -0800
Subject: layout standarization for profiles

---
 indra/newview/skins/default/xui/en/panel_me.xml    |   2 +-
 .../skins/default/xui/en/panel_my_profile.xml      |  72 +++++++++------
 indra/newview/skins/default/xui/en/panel_notes.xml |  20 ++---
 .../newview/skins/default/xui/en/panel_profile.xml | 100 ++++++++++++---------
 .../skins/default/xui/en/panel_profile_view.xml    |   6 +-
 5 files changed, 120 insertions(+), 80 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_me.xml b/indra/newview/skins/default/xui/en/panel_me.xml
index a99777848b..e779e37419 100644
--- a/indra/newview/skins/default/xui/en/panel_me.xml
+++ b/indra/newview/skins/default/xui/en/panel_me.xml
@@ -26,7 +26,7 @@
    </text> -->
     <tab_container
      follows="all"
-     height="575"
+     height="570"
      halign="center"
      layout="topleft"
      left="10"
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 ffc568281e..12a0a9155d 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -31,24 +31,41 @@
 	 name="RegisterDateFormat">
 	 [REG_DATE] ([AGE])
 	</string>
-    <scroll_container
-     color="DkGray2"
+    <layout_stack
+     name="layout"
+     orientation="vertical"
      follows="all"
-     height="500"
      layout="topleft"
-     name="profile_scroll"
-     reserve_scroll_corner="false"
-     opaque="true"
+     left="0"
      top="0"
-     width="313">
+     height="535"
+     width="313"
+     border_size="0">
       <panel
-         name="scroll_content_panel"
+         name="profile_stack"
          follows="all"
-          height="500"
          layout="topleft"
          top="0"
          left="0"
+         height="505"
          width="313">
+            <scroll_container
+             color="DkGray2"
+             follows="all"
+             layout="topleft"
+             left="0"
+             name="profile_scroll"
+             opaque="true"
+             height="505"
+             width="313"
+             top="0">
+	       <panel
+               layout="topleft"
+	       follows="left|top|right"
+              name="scroll_content_panel"
+               top="0"
+               left="0"
+               width="303">
 	 <panel
          follows="left|top|right"
          height="117"
@@ -212,16 +229,18 @@
          top_delta="0"
 	 value="Go to Dashboard"
          width="100"/> -->
-        <text
+         <text
          follows="left|top"
-         height="20"
+         height="28"
          layout="topleft"
          left="10"
          name="acc_status_text"
          top_pad="0"
-         value="Resident. No payment info on file."
          width="300"
-         word_wrap="true" />
+         word_wrap="true">
+	 Resident. No payment info on file.
+Linden.
+	 </text>
         <text
          follows="left|top"
 	 font.style="BOLD"
@@ -265,26 +284,26 @@
          width="300" />
          <expandable_text
          follows="all"
-         height="115"
+         height="113"
          layout="topleft"
          left="7"
          name="sl_groups"
        top_pad="0"
-         width="300"
+         width="298"
          expanded_bg_visible="true"
          expanded_bg_color="DkGray">
             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. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
         </expandable_text>
-      </panel>
+    </panel>
  </scroll_container>
- <panel
+      </panel>
+<!-- <panel
      follows="bottom|left"
      layout="topleft"
      left="0"
      name="profile_buttons_panel"
-     top_pad="2"
-     height="23"
-     width="303">
+     height="28"
+     width="313">
          <button
          follows="bottom|left"
          height="23"
@@ -333,20 +352,21 @@
          left_pad="3"
          top="5"
          width="85" />
- </panel>
+ </panel>-->
  <panel
      follows="bottom|left"
      layout="topleft"
      left="0"
-     top_pad="-22"
+     top_pad="0"
      name="profile_me_buttons_panel"
      visible="false"
-     height="23"
-     width="303">
+     height="28"
+     width="313">
         <button
          follows="bottom|right"
          height="23"
-         left="10"
+         left="20"
+	 top="0"
          label="Edit Profile"
          name="edit_profile_btn"
          tool_tip="Edit your personal information"
@@ -358,7 +378,7 @@
          left_pad="10"
          name="edit_appearance_btn"
          tool_tip="Create/edit your appearance: physical data, clothes and etc."
-         right="-10"
          width="130" />
  </panel>
+</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index f15e75dee9..9335db0623 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -115,14 +115,14 @@
        <button
          follows="bottom|left"
          height="23"
-         label="Add"
+         label="Add Friend"
          layout="topleft"
          left="0"
          mouse_opaque="false"
          name="add_friend"
          tool_tip="Offer friendship to the resident"
          top="5"
-         width="55" />
+         width="80" />
         <button
          follows="bottom|left"
          height="23"
@@ -131,8 +131,8 @@
          name="im"
          tool_tip="Open instant message session"
          top="5"
-         left_pad="5"
-         width="40" />
+         left_pad="3"
+         width="45" />
         <button
          follows="bottom|left"
          height="23"
@@ -140,9 +140,9 @@
          layout="topleft"
          name="call"
          tool_tip="Call this resident"
-         left_pad="5"
+         left_pad="3"
          top="5"
-         width="55" />
+         width="45" />
         <button
          enabled="false"
          follows="bottom|left"
@@ -152,8 +152,8 @@
          name="show_on_map_btn"
          tool_tip="Show the resident on the map"
          top="5"
-         left_pad="5"
-         width="50" />
+         left_pad="3"
+         width="45" />
         <button
          follows="bottom|left"
          height="23"
@@ -161,9 +161,9 @@
          layout="topleft"
          name="teleport"
          tool_tip="Offer teleport"
-         left_pad="5"
+         left_pad="3"
          top="5"
-         width="90" />
+         width="80" />
         </panel>
     </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index bf592535f5..5ccc964c9a 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -31,24 +31,41 @@
 	 name="RegisterDateFormat">
 	 [REG_DATE] ([AGE])
 	</string>
-  <scroll_container
-     color="DkGray2"
+    <layout_stack
+     name="layout"
+     orientation="vertical"
      follows="all"
-     height="500"
      layout="topleft"
-     name="profile_scroll"
-     reserve_scroll_corner="false"
-     opaque="true"
+     left="0"
      top="0"
-     width="313">
+     height="535"
+     width="313"
+     border_size="0">
       <panel
-         name="scroll_content_panel"
+         name="profile_stack"
          follows="all"
-          height="500"
          layout="topleft"
          top="0"
          left="0"
+         height="505"
          width="313">
+            <scroll_container
+             color="DkGray2"
+             follows="all"
+             layout="topleft"
+             left="0"
+             name="profile_scroll"
+             opaque="true"
+             height="505"
+             width="313"
+             top="0">
+	       <panel
+               layout="topleft"
+	       follows="left|top|right"
+               name="profile_scroll_panel"
+               top="0"
+               left="0"
+               width="303">
 	 <panel
          follows="left|top|right"
          height="117"
@@ -56,7 +73,7 @@
          left="10"
          name="second_life_image_panel"
          top="0"
-         width="300">
+         width="303">
             <texture_picker
              allow_no_texture="true"
              default_image_name="None"
@@ -87,7 +104,7 @@
              textbox.max_length="512"
              name="sl_description_edit"
              top_pad="-3"
-             width="188"
+             width="185"
              expanded_bg_visible="true"
              expanded_bg_color="DkGray">
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
@@ -100,7 +117,7 @@
 	 top_pad="10"
          left="10"
          name="first_life_image_panel"
-         width="300">
+         width="303">
             <texture_picker
              allow_no_texture="true"
              default_image_name="None"
@@ -130,7 +147,7 @@
              textbox.max_length="512"
              name="fl_description_edit"
              top_pad="-3"
-             width="188"
+             width="185"
              expanded_bg_visible="true"
              expanded_bg_color="DkGray">
                 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.
@@ -194,14 +211,16 @@
          width="100"/> -->
         <text
          follows="left|top"
-         height="20"
+         height="28"
          layout="topleft"
          left="10"
          name="acc_status_text"
          top_pad="0"
-         value="Resident. No payment info on file."
          width="300"
-         word_wrap="true" />
+         word_wrap="true">
+	 Resident. No payment info on file.
+Linden.
+	 </text>
         <text
          follows="left|top"
 	 font.style="BOLD"
@@ -245,26 +264,25 @@
          width="300" />
          <expandable_text
          follows="all"
-         height="115"
+         height="113"
          layout="topleft"
          left="7"
          name="sl_groups"
-       top_pad="0"
-         width="300"
+         top_pad="0"
+         width="298"
          expanded_bg_visible="true"
          expanded_bg_color="DkGray">
             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. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
         </expandable_text>
-      </panel>
+    </panel>
  </scroll_container>
+</panel>
  <panel
-     follows="bottom|left"
-     layout="topleft"
-     left="0"
-     name="profile_buttons_panel"
-     top_pad="2"
-     height="23"
-     width="303">
+         follows="bottom|left"
+         height="28"
+         layout="topleft"
+         name="profile_buttons_panel"
+         width="313">
         <button
          follows="bottom|left"
          height="23"
@@ -328,22 +346,23 @@
          top="5"
 	 left_pad="3"
          width="23" />-->
- </panel>
+        </panel>
  <panel
-     follows="bottom|left"
-     layout="topleft"
-     left="0"
-     top_pad="-22"
-     name="profile_me_buttons_panel"
-     visible="false"
-     height="23"
-     width="303">
+         follows="bottom|left"
+         height="28"
+         layout="topleft"
+     top_pad="-26"
+         name="profile_me_buttons_panel"
+         visible="false"
+	 width="313">
         <button
          follows="bottom|right"
          height="23"
-         left="10"
+         left="20"
+	 top="0"
          label="Edit Profile"
          name="edit_profile_btn"
+         tool_tip="Edit your personal information"
          width="130" />
         <button
          follows="bottom|right"
@@ -351,7 +370,8 @@
          label="Edit Appearance"
          left_pad="10"
          name="edit_appearance_btn"
-         right="-10"
+         tool_tip="Create/edit your appearance: physical data, clothes and etc."
          width="130" />
- </panel>
-</panel>
+        </panel>
+    </layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index 6324ec2bd8..c51447eaf0 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -26,8 +26,8 @@
      top="2"
      width="23" />
     <text_editor
-      allow_scroll="false" 
-      bg_visible="false" 
+      allow_scroll="false"
+      bg_visible="false"
       read_only = "true"
       follows="top|left|right"
       font="SansSerifHugeBold"
@@ -55,7 +55,7 @@
      halign="center"
      layout="topleft"
      left="10"
-	 min_width="333"
+     min_width="333"
      name="tabs"
      tab_min_width="80"
      tab_height="30"
-- 
cgit v1.2.3