From 5a220b63ca3a485ac251f44f7bebf029a7670542 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Thu, 12 Nov 2009 16:01:48 -0800
Subject: added comments to textures.xml

---
 indra/newview/skins/default/textures/textures.xml | 30 +++++++++++++++++++++++
 1 file changed, 30 insertions(+)

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index eea2dfb1a1..4c272b6bb5 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -1,3 +1,33 @@
+<!--
+This file contains metadata about how to load, display, and scale textures for rendering in the UI.
+Images do *NOT* have to appear in this file in order to use them as textures in the UI...simply refer 
+to them by filename (relative to textures directory).
+NOTE: if you want to reuse an image file with different metadata, simply create a new texture entry 
+with the same filename but different name
+
+<texture
+  name="MyTexture" (mandatory)
+    - this is the name you reference the texture by in XUI.  For example, <button image_unselected="MyTexture"/>
+  file_name="images/my_texture.png" (optional)
+    - this is the path to the actual file asset, relative to the current skins "textures" directory.  
+      If not supplied, the filename will be taken from the texture name itself, "MyTexture" in this case.  
+      NOTE: you need to provide an extension on the filename (".png", ".tga", ".jpg") for us to decode the image properly
+  preload="true" (optional, false by default)
+    - If true, we will attempt to load the image before displaying any UI.  
+      If false, we will load in the background after initializing the UI.
+  use_mips="true" (currently unused)
+  scale.left="1"
+  scale.bottom="1"
+  scale.top="15"
+  scale.right="31"
+    - Specifies the segmentation for 9-slice image scaling.  Specifically, the pixel offsets from the LOWER LEFT corner
+      that define the region of the image that is stretched to make the whole image fit in the required space.
+      In this example, if the source image is 32x16 pixels, we have defined a center region that starts one pixel up
+      and to the right from the bottom left corner and extends to 31 pixels right and 15 pixels up from the bottom left 
+      corner.  The end result is that the image will keep a 1 pixel border all around while stretching to fit the required 
+      region.
+-->
+
 <textures version="101">
   <!-- Please add new files alphabetically to prevent merge conflicts. JC -->
   <texture name="Accordion_ArrowClosed_Off" file_name="containers/Accordion_ArrowClosed_Off.png" preload="false" />
-- 
cgit v1.2.3


From 81b64fd88be9793688c0924bcc25aa38b0ba85b4 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Mon, 16 Nov 2009 11:35:33 -0800
Subject: changed spacing to accomodate icons in owner/creator label

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

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

diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
index 1365a0483f..09a26f5926 100644
--- a/indra/newview/skins/default/xui/en/inspect_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_object.xml
@@ -40,14 +40,14 @@ owner [OWNER]
   <text
    follows="all"
    font="SansSerif"
-   height="30"
+   height="33"
    left="8"
    name="object_creator"
    top_pad="0"
    use_ellipses="true"
    width="275">
-by Longavatarname Johnsonlongstonnammer
-owner James Linden
+    by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
   </text>
   <!-- *TODO: Replace this icon -->
   <icon
@@ -56,7 +56,7 @@ owner James Linden
   left="7"
   width="16"
   height="16"
-  top="52"
+  top="56"
   follows="left|top"
   />
   <text
@@ -66,7 +66,7 @@ owner James Linden
    left_pad="5"
    name="price_text"
    text_color="white"
-   top="54"
+   top="58"
    font_shadow="none"
    width="150">
 L$300,000
-- 
cgit v1.2.3


From 6d6ee6af54cb1c1e1a73ae5697b5d9865e9dac42 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 17 Nov 2009 12:03:57 -0800
Subject: EXT-2226 Add "Rotate Mini Map" toggle to mini-map context menu
 Reviewed with Kelly

---
 .../newview/skins/default/xui/en/menu_mini_map.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml
index 5cbbd71bfe..8d0edf018d 100644
--- a/indra/newview/skins/default/xui/en/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml
@@ -10,7 +10,6 @@
  width="128">
     <menu_item_call
      label="Zoom Close"
-     layout="topleft"
      name="Zoom Close">
         <menu_item_call.on_click
          function="Minimap.Zoom"
@@ -18,7 +17,6 @@
     </menu_item_call>
     <menu_item_call
      label="Zoom Medium"
-     layout="topleft"
      name="Zoom Medium">
         <menu_item_call.on_click
          function="Minimap.Zoom"
@@ -26,29 +24,31 @@
     </menu_item_call>
     <menu_item_call
      label="Zoom Far"
-     layout="topleft"
      name="Zoom Far">
         <menu_item_call.on_click
          function="Minimap.Zoom"
          parameter="far" />
     </menu_item_call>
-    <menu_item_separator
-     layout="topleft"
-     name="Tracking Separator" />
+    <menu_item_check
+       label="Rotate Map"
+       name="Rotate Map">
+          <menu_item_check.on_check
+             control="MiniMapRotate" />
+          <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="MiniMapRotate" />
+    </menu_item_check>
+    <menu_item_separator />
     <menu_item_call
      label="Stop Tracking"
-     layout="topleft"
      name="Stop Tracking">
         <menu_item_call.on_click
          function="Minimap.Tracker"
          parameter="task_properties" />
     </menu_item_call>
-    <menu_item_separator
-     layout="topleft"
-     name="Tracking Separator" />
+    <menu_item_separator />
     <menu_item_call
      label="World Map"
-     layout="topleft"
      name="World Map">
         <menu_item_call.on_click
          function="ShowFloater"
-- 
cgit v1.2.3


From 04c92ee97d0da923159eac3619aa892c9832aeee Mon Sep 17 00:00:00 2001
From: Lis Pardi <lis@lindenlab.com>
Date: Tue, 17 Nov 2009 15:34:54 -0500
Subject: ext-2473 Zoom has two + buttons and no -

---
 indra/newview/skins/default/textures/textures.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 8af65b25e9..1e47701e35 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -106,7 +106,6 @@
   <texture name="DropDown_Press" file_name="widgets/DropDown_Press.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="DropDown_Selected" file_name="widgets/DropDown_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="DropDown_Off" file_name="widgets/DropDown_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
-  <texture name="DropDown_On" file_name="widgets/DropDown_On.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
 
   <texture name="DropTarget" file_name="widgets/DropTarget.png" preload="false" />
 
@@ -231,6 +230,10 @@
   <texture name="Microphone_Mute" file_name="icons/Microphone_Mute.png" preload="false" />
   <texture name="Microphone_On" file_name="icons/Microphone_On.png" preload="false" />
 
+  <texture name="MinusItem_Disabled" file_name="icons/MinusItem_Disabled.png" preload="false" />
+  <texture name="MinusItem_Off" file_name="icons/MinusItem_Off.png" preload="false" />
+  <texture name="MinusItem_Press" file_name="icons/MinusItem_Press.png" preload="false" />
+
   <texture name="menu_separator" file_name="navbar/FileMenu_Divider.png" scale.left="4" scale.top="166" scale.right="0" scale.bottom="0" />
 
   <texture name="Move_Fly_Disabled" file_name="bottomtray/Move_Fly_Disabled.png" preload="false" />
-- 
cgit v1.2.3


From 6e15f2fd6fbc49f85ea0168d2cedae5b0f395af1 Mon Sep 17 00:00:00 2001
From: Lis Pardi <lis@lindenlab.com>
Date: Tue, 17 Nov 2009 15:36:33 -0500
Subject: ext-2473 zoom has two + buttons and no -

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index f553184c19..69f9f6a2f8 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -87,9 +87,9 @@
            <button
               follows="top|left"
               height="18"
-              image_disabled="AddItem_Disabled"
-              image_selected="AddItem_Press"
-              image_unselected="AddItem_Off"
+              image_disabled="MinusItem_Disabled"
+              image_selected="MinusItem_Press"
+              image_unselected="MinusItem_Off"
               layout="topleft"
               name="zoom_minus_btn"
               top_pad="0"
-- 
cgit v1.2.3


From 630bb056413133d0e6ea58d00e148119d4fc5e3f Mon Sep 17 00:00:00 2001
From: Lis Pardi <lis@lindenlab.com>
Date: Tue, 17 Nov 2009 16:28:04 -0500
Subject: ext-2473 Zoom has two + buttons and no -

---
 .../skins/default/textures/icons/MinusItem_Disabled.png   | Bin 0 -> 173 bytes
 .../skins/default/textures/icons/MinusItem_Off.png        | Bin 0 -> 178 bytes
 .../skins/default/textures/icons/MinusItem_Press.png      | Bin 0 -> 172 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/MinusItem_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/icons/MinusItem_Off.png
 create mode 100644 indra/newview/skins/default/textures/icons/MinusItem_Press.png

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

diff --git a/indra/newview/skins/default/textures/icons/MinusItem_Disabled.png b/indra/newview/skins/default/textures/icons/MinusItem_Disabled.png
new file mode 100644
index 0000000000..75bd73cef1
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/MinusItem_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/icons/MinusItem_Off.png b/indra/newview/skins/default/textures/icons/MinusItem_Off.png
new file mode 100644
index 0000000000..6f285f3546
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/MinusItem_Off.png differ
diff --git a/indra/newview/skins/default/textures/icons/MinusItem_Press.png b/indra/newview/skins/default/textures/icons/MinusItem_Press.png
new file mode 100644
index 0000000000..50f65765d5
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/MinusItem_Press.png differ
-- 
cgit v1.2.3


From 34a267fddf8c7cd95b82af1eef9eb5cc21bf0571 Mon Sep 17 00:00:00 2001
From: Lis Pardi <lis@lindenlab.com>
Date: Tue, 17 Nov 2009 17:58:48 -0500
Subject: ext-2557 Buttons should not be bolded. Changed lots of SansSerifBold
 and SansSerifSmallBold to SansSerif and SansSerifSmall

---
 indra/newview/skins/default/xui/en/floater_land_holdings.xml |  4 ++--
 indra/newview/skins/default/xui/en/panel_picks.xml           |  8 ++++----
 indra/newview/skins/default/xui/en/sidepanel_inventory.xml   | 10 +++++-----
 indra/newview/skins/default/xui/en/sidepanel_item_info.xml   |  6 +++---
 indra/newview/skins/default/xui/en/sidepanel_task_info.xml   | 12 ++++++------
 5 files changed, 20 insertions(+), 20 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
index 2c04a94613..e3751f2bd9 100644
--- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
@@ -42,7 +42,7 @@
     </scroll_list>
     <button
      height="23"
-     font="SansSerifBold"
+     font="SansSerif"
      label="Teleport"
      label_selected="Teleport"
      layout="topleft"
@@ -53,7 +53,7 @@
      width="80" />
     <button
      height="23"
-     font="SansSerifBold"
+     font="SansSerif"
      label="Map"
      label_selected="Map"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 9cfbed432a..79cda98cc6 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -120,7 +120,7 @@
        <button
          enabled="false"
          follows="bottom|left"
-         font="SansSerifSmallBold"
+         font="SansSerifSmall"
          height="25"
          label="Info"
          layout="topleft"
@@ -132,7 +132,7 @@
         <button
          enabled="false"
          follows="bottom|left"
-         font="SansSerifSmallBold"
+         font="SansSerifSmall"
          height="25"
          label="Teleport"
          layout="topleft"
@@ -144,7 +144,7 @@
         <button
          enabled="false"
          follows="bottom|left"
-         font="SansSerifSmallBold"
+         font="SansSerifSmall"
          height="25"
          label="Map"
          layout="topleft"
@@ -156,7 +156,7 @@
         <button
          enabled="false"
          follows="bottom|right"
-         font="SansSerifSmallBold"
+         font="SansSerifSmall"
          height="25"
          label="▼"
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index cbcc3f10ad..377d34cdcc 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -41,7 +41,7 @@
 			<button
 				 enabled="true"
 				 follows="bottom|left"
-				 font="SansSerifSmallBold"
+				 font="SansSerifSmall"
 				 height="25"
 				 label="Info"
 				 layout="topleft"
@@ -52,7 +52,7 @@
 			<button
 				 enabled="true"
 				 follows="bottom|left"
-				 font="SansSerifSmallBold"
+				 font="SansSerifSmall"
 				 height="25"
 				 label="Share"
 				 layout="topleft"
@@ -63,7 +63,7 @@
 			<button
 				 enabled="false"
 				 follows="bottom|left"
-				 font="SansSerifSmallBold"
+				 font="SansSerifSmall"
 				 height="25"
 				 label="Wear"
 				 layout="topleft"
@@ -74,7 +74,7 @@
 			<button
 				 enabled="false"
 				 follows="bottom|left"
-				 font="SansSerifSmallBold"
+				 font="SansSerifSmall"
 				 height="25"
 				 label="Play"
 				 layout="topleft"
@@ -85,7 +85,7 @@
 			<button
 				 enabled="false"
 				 follows="bottom|left"
-				 font="SansSerifSmallBold"
+				 font="SansSerifSmall"
 				 height="25"
 				 label="Teleport"
 				 layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 39cd75074e..0c605650fc 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -479,7 +479,7 @@
 		 width="313">
 	    <button
 		     follows="bottom|left"
-		     font="SansSerifSmallBold"
+		     font="SansSerifSmall"
 		     height="25"
 		     label="Edit"
 		     layout="topleft"
@@ -489,7 +489,7 @@
 		     width="50" />
 	    <button
 		     follows="bottom|right"
-		     font="SansSerifSmallBold"
+		     font="SansSerifSmall"
 		     height="25"
 		     label="Cancel"
 		     layout="topleft"
@@ -499,7 +499,7 @@
 		     width="70" />
 	    <button
 		     follows="bottom|right"
-		     font="SansSerifSmallBold"
+		     font="SansSerifSmall"
 		     height="25"
 		     label="Save"
 		     layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 8eb2254112..7647be7830 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -485,7 +485,7 @@
 		 width="313">
 	    <button
 		     follows="bottom|left"
-		     font="SansSerifSmallBold"
+		     font="SansSerifSmall"
 		     height="25"
 		     label="Edit"
 		     layout="topleft"
@@ -495,7 +495,7 @@
 		     width="50" />
 	    <button
 		     follows="bottom|left"
-		     font="SansSerifSmallBold"
+		     font="SansSerifSmall"
 		     height="25"
 		     label="Open"
 		     layout="topleft"
@@ -505,7 +505,7 @@
 		     width="60" />
 	    <button
 		     follows="bottom|left"
-		     font="SansSerifSmallBold"
+		     font="SansSerifSmall"
 		     height="25"
 		     label="Pay"
 		     layout="topleft"
@@ -515,7 +515,7 @@
 		     width="50" />
 	    <button
 		     follows="bottom|left"
-		     font="SansSerifSmallBold"
+		     font="SansSerifSmall"
 		     height="25"
 		     label="Buy"
 		     layout="topleft"
@@ -525,7 +525,7 @@
 		     width="60" />
 	    <button
 		     follows="bottom|right"
-		     font="SansSerifSmallBold"
+		     font="SansSerifSmall"
 		     height="25"
 		     label="Cancel"
 		     layout="topleft"
@@ -535,7 +535,7 @@
 		     width="70" />
 	    <button
 		     follows="bottom|right"
-		     font="SansSerifSmallBold"
+		     font="SansSerifSmall"
 		     height="25"
 		     label="Save"
 		     layout="topleft"
-- 
cgit v1.2.3


From 15cbc0abd89d97ab06ed8f0c2a4bb2245e75535c Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 17 Nov 2009 16:07:48 -0800
Subject: EXT-2403 Object name, description now forced to be ASCII characters
 only Also fixes EXT-172, EXT-2399.  Semantics now are: Object name, object
 desc, parcel name, region name, inventory item name all are ASCII only.
 Parcel desc allows arbitrary Unicode chars. Group names force ASCII only.
 Reviewed with Leyla

---
 .../skins/default/xui/en/floater_test_line_editor.xml       | 13 ++++++++++++-
 indra/newview/skins/default/xui/en/floater_tools.xml        |  8 --------
 2 files changed, 12 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
index e017d404c6..0531b52e5a 100644
--- a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
@@ -18,7 +18,18 @@
     Enabled line editor
   </line_editor>
   <line_editor
-    enabled="false"
+   height="20"
+   layout="topleft"
+   left_delta="0"
+   name="ascii_line_editor"
+   prevalidate_callback="ascii"
+   tool_tip="ascii line editor"
+   top_pad="10" 
+   width="200">
+    ASCII only line editor
+  </line_editor>
+  <line_editor
+   enabled="false"
    height="20"
    layout="topleft"
    left_delta="0"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index b2f46bc433..944b4cda98 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -809,11 +809,8 @@
                 Mixed Sale
             </panel.string>
             <text
-             type="string"
-             length="1"
              follows="left|top"
              height="10"
-             layout="topleft"
              left="10"
              name="Name:"
              top="0"
@@ -823,7 +820,6 @@
             <line_editor
              follows="left|top|right"
              height="19"
-             layout="topleft"
              left_pad="0"
              max_length="63"
              name="Object Name"
@@ -831,11 +827,8 @@
              top_delta="0"
              width="170" />
             <text
-             type="string"
-             length="1"
              follows="left|top"
              height="10"
-             layout="topleft"
              left="10"
              name="Description:"
              top_pad="3"
@@ -845,7 +838,6 @@
             <line_editor
              follows="left|top|right"
              height="19"
-             layout="topleft"
              left_pad="0"
              max_length="127"
              name="Object Description"
-- 
cgit v1.2.3


From 49ce27aa68ffb221f5be8118bffd5c98bbdb214d Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 18 Nov 2009 09:19:02 -0800
Subject: Fix merge conflict with button fonts, use SansSerifSmall (not bold)

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

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 89cf9e006c..041297a542 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -72,7 +72,7 @@
        	 width="80" />
     <button
     	 follows="bottom|left"
-     font="SansSerifSmallBold"
+     font="SansSerifSmall"
   	     height="25"
   	     label="New Outfit"
   	     layout="topleft"
-- 
cgit v1.2.3


From 5d7391458116cd3f43c7073edcd2c8b5dcf8e0c3 Mon Sep 17 00:00:00 2001
From: Lis Pardi <lis@lindenlab.com>
Date: Wed, 18 Nov 2009 13:02:08 -0500
Subject: ext-2629 Arrange order of satus bar to match spec

---
 .../skins/default/xui/en/panel_status_bar.xml      | 30 ++++++++++++----------
 1 file changed, 16 insertions(+), 14 deletions(-)

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

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 8fc78c6701..b1afe76500 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -48,38 +48,40 @@
      image_unselected="BuyArrow_Off"
      image_pressed="BuyArrow_Press"
      height="16"
-     left="-245"
+     left="-200"
      name="buycurrency"
-     pad_right="22px"
+     pad_right="20px"
      tool_tip="My Balance: Click to buy more L$"
      top="1"
-     width="117" />
-    <button
-     follows="right|bottom"
-     height="16"
-     image_selected="parcel_drk_VoiceNo"
-     image_unselected="parcel_drk_Voice"
-     is_toggle="true"
-     left_pad="15"
-     top="1"
-     name="volume_btn"
-     width="16" />
+     width="90" />
     <text
      type="string"
      length="1"
+     font="SansSerifSmall"
      text_readonly_color="TimeTextColor"
      follows="right|bottom"
      halign="right"
      height="16"
      top="5"
      layout="topleft"
-     left_pad="7"
+     left_pad="-5"
      name="TimeText"
      text_color="TimeTextColor"
      tool_tip="Current time (Pacific)"
      width="80">
         12:00 AM
     </text>
+    <button
+     follows="right|bottom"
+     height="16"
+     image_selected="parcel_drk_VoiceNo"
+     image_unselected="parcel_drk_Voice"
+     is_toggle="true"
+     left_pad="5"
+     top="1"
+     name="volume_btn"
+     tool_tip="Global Volume Control"
+     width="16" />
     <text
      enabled="true"
      follows="right|bottom"
-- 
cgit v1.2.3


From b314f9062d78c225f9f17e760fc8ea32f85d4a3d Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 18 Nov 2009 10:03:40 -0800
Subject: Nudge parabuild

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index e4ab533bc5..4bbd561882 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -5,6 +5,6 @@
  name="floater_aaa"
  can_resize="true" 
  width="1024">
- <string name="Nudge Parabuild">1</string>
+ <string name="Nudge Parabuild">2</string>
   <panel filename="main_view.xml" follows="all" width="1024" height="768" top="0"/>
 </floater>
-- 
cgit v1.2.3


From d09de2402306c65622c16eba36f698ef9aa3294a Mon Sep 17 00:00:00 2001
From: Lis Pardi <lis@lindenlab.com>
Date: Wed, 18 Nov 2009 13:15:27 -0500
Subject: ext-2633 Default Upload Permissions floater all messed up

---
 .../skins/default/xui/en/floater_perm_prefs.xml    | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
index 6faab84159..4909b8988f 100644
--- a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
@@ -22,10 +22,10 @@
          height="16"
          label="Share with group"
          layout="topleft"
-         left_delta="-250"
+         left="10"
          name="share_with_group"
-         top_delta="2"
-         width="106" />
+         top="5"
+         width="150" />
         <check_box
          control_name="EveryoneCopy"
          height="16"
@@ -33,8 +33,8 @@
          layout="topleft"
          left_delta="0"
          name="everyone_copy"
-         top_pad="16"
-         width="130" />
+         top_pad="5"
+         width="150" />
         <text
          type="string"
          length="1"
@@ -43,8 +43,8 @@
          layout="topleft"
          left_delta="0"
          name="NextOwnerLabel"
-         top_pad="16"
-         width="88">
+         top_pad="5"
+         width="150">
             Next owner can:
         </text>
         <check_box
@@ -54,17 +54,17 @@
          layout="topleft"
          left_delta="0"
          name="next_owner_modify"
-         top_pad="14"
-         width="78" />
+         top_pad="5"
+         width="150" />
         <check_box
          control_name="NextOwnerCopy"
          height="16"
          label="Copy"
          layout="topleft"
-         left_delta="78"
+         left_delta="0"
          name="next_owner_copy"
-         top_delta="0"
-         width="88" >
+         top_pad="5"
+         width="150" >
 		    <check_box.commit_callback
 			function="Perms.Copy" />
 		</check_box>
@@ -76,10 +76,10 @@
          initial_value="true"
          label="Resell/Give away"
          layout="topleft"
-         left_delta="88"
+         left_delta="0"
          name="next_owner_transfer"
-         top_delta="0"
-         width="106" />
+         top_pad="5"
+         width="150" />
     </panel>
     <button
      height="20"
-- 
cgit v1.2.3


From a05f63b98912a5b6e7f4f3fa4fec1e57dc987a23 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Wed, 18 Nov 2009 14:43:30 -0800
Subject:   EXT-2638 Add Close X to IM and Chat log windows

---
 .../skins/default/xui/en/floater_im_session.xml    | 102 +++++++++++----------
 .../skins/default/xui/en/floater_nearby_chat.xml   |   2 +-
 .../skins/default/xui/en/panel_chat_header.xml     |  12 +--
 .../default/xui/en/panel_im_control_panel.xml      |  17 ++--
 4 files changed, 69 insertions(+), 64 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 4792a1a476..e972cf39bf 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -8,67 +8,71 @@
  left="0"
  name="panel_im"
  top="0"
- can_close="false"
+ can_close="true"
  can_dock="true"
- can_minimize="false"
+ can_minimize="true"
  visible="true"
- width="320"
+ width="350"
  can_resize="true"
  min_width="300"
  min_height="350">
-  <layout_stack follows="all"
-                height="350"
-                width="300"
-                layout="topleft"
-                orientation="horizontal"
-                name="im_panels"
-                top="20"
-                left="0">
+  <layout_stack
+  follows="all"
+  height="350"
+  width="300"
+  layout="topleft"
+  orientation="horizontal"
+  name="im_panels"
+  top="20"
+  left="0">
     <layout_panel
       name="panel_im_control_panel"
       layout="topleft"
-      top_delta="-3"
-      height="350"
       follows="left"
       label="IM Control Panel"
       auto_resize="false"
       user_resize="false" />
-    <layout_panel height="350"
-                  width=""
-                  left_delta="110"
-                  top="0"
-                  user_resize="false">
-      <button height="20"
-      	      follows="left|top"
-              top="0"
-              image_overlay="TabIcon_Open_Off"
-              layout="topleft"
-              width="25"
-              name="slide_left_btn" />
-      <button height="20"
-      	      follows="left|top"
-              top="0"
-              image_overlay="TabIcon_Close_Off"
-              width="25"
-              name="slide_right_btn" />
-      <chat_history
-       length="1"
-       follows="all"
-       height="275"
-       layout="topleft"
-       name="chat_history"
-       parse_highlights="true"
-       allow_html="true"
-       width="160">
-      </chat_history>
-      <line_editor
-       follows="left|right"
-       height="20"
-       label="To"
-       layout="topleft"
-       name="chat_editor"
-       width="160">
-      </line_editor>
+    <layout_panel
+       left="0"
+       top="0"
+       user_resize="false">
+        <button
+          height="20"
+          follows="left|top"
+          top="0"
+          left="2"
+          image_overlay="TabIcon_Open_Off"
+          layout="topleft"
+          width="25"
+          name="slide_left_btn" />
+         <button
+          height="20"
+          follows="left|top"
+          top="0"
+          left="2"
+          image_overlay="TabIcon_Close_Off"
+          width="25"
+          name="slide_right_btn" />
+        <chat_history
+         length="1"
+	 font="SansSerifSmall"
+         follows="left|right|top"
+         height="280"
+         name="chat_history"
+         parse_highlights="true"
+         allow_html="true"
+        left="1"
+         width="180">
+        </chat_history>
+        <line_editor
+         follows="left|right|top"
+	 font="SansSerifSmall"
+         height="20"
+         label="To"
+         name="chat_editor"
+         top_pad="1"
+         width="180">
+        </line_editor>
     </layout_panel>
   </layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index 69b015a727..d8534bfe0b 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -5,7 +5,7 @@
  can_tear_off="false"
  can_resize="true"
  can_drag_on_left="false"
- can_close="false"
+ can_close="true"
  can_dock="true"
  bevel_style="in"
  height="300"
diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml
index 323ee957e7..7a3eae35a9 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml
@@ -3,13 +3,13 @@
       background_visible="true"
      bevel_style="in"
      bg_alpha_color="black"
-     follows="top"
+     follows="top|left|right"
      height="24"
- label="im_header"
- layout="topleft"
- name="im_header"
- width="300">
-             <avatar_icon
+     label="im_header"
+     layout="topleft"
+     name="im_header"
+     width="300">
+            <avatar_icon
          follows="left"
          height="18"
          image_name="Generic_Person"
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 9573904c93..73d843e6dd 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -38,28 +38,29 @@
      label="Teleport"
      name="teleport_btn"
      width="100" />
-    <button
+  <!--  <button
      follows="left|top"
      height="20"
      label="Share"
      name="share_btn"
-     width="100" />
-    <button
+     width="100" />-->
+     <!--Removing pay button to save space - will update spec - verified by Erica/Steve -->
+ <!--   <button
      follows="left|top"
      height="20"
      label="Pay"
      name="pay_btn"
-     width="100" />
+     width="100" />-->
     <panel
      background_visible="true"
      bg_alpha_color="DkGray2"
      border="false"
-     follows="left|top"
+     top_pad="10"
+     follows="left|bottom"
      height="70"
-     left="0"
-     left_pad="0"
+     left="1"
      name="panel_call_buttons"
-     width="110">
+     width="109">
         <button
          bottom="10"
          height="20"
-- 
cgit v1.2.3