From f9b72917847ea75cb1a4137f959072abc1b76904 Mon Sep 17 00:00:00 2001
From: Erica Olsen <erica@lindenlab.com>
Date: Fri, 18 Sep 2009 23:11:21 +0000
Subject: [PATCH] EXT-1072 XUI Army Places layout from style guide - Created an
 empty layout for Places Profile - File should be removed and layout
 integrated into PE Places work. Layout lives in:
 panel_place_profile_layout.xml Included new for sale icon.

---
 .../default/textures/icons/Icon_For_Sale.png  | Bin 0 -> 6654 bytes
 .../skins/default/textures/textures.xml       |   4 +-
 .../skins/default/xui/en/panel_people.xml     |   3 +-
 .../skins/default/xui/en/panel_profile.xml    |   6 +-
 .../default/xui/en/panel_region_estate.xml    | 206 ++++++++----------
 5 files changed, 93 insertions(+), 126 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Icon_For_Sale.png

diff --git a/indra/newview/skins/default/textures/icons/Icon_For_Sale.png b/indra/newview/skins/default/textures/icons/Icon_For_Sale.png
new file mode 100644
index 0000000000000000000000000000000000000000..01e8697138af76a3883551a922a87c9bcc4b4cb8
GIT binary patch
literal 6654
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
IM6N<$f&@SA-v9sr

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 20801da653..9e87ddb373 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -79,7 +79,7 @@
   <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="DropTarget" file_name="widgets/DropTarget.png" preload="false" />
 
   <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" />
@@ -115,6 +115,8 @@
   <texture name="Icon_Dock_Foreground" file_name="windows/Icon_Dock_Foreground.png" preload="true" />
   <texture name="Icon_Dock_Press" file_name="windows/Icon_Dock_Press.png" preload="true" />
 
+  <texture name="Icon_For_Sale" file_name="windows/Icon_For_sale.png" preload="false" />
+
   <texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="false" />
   <texture name="Icon_Gear_Foreground" file_name="windows/Icon_Gear_Foreground.png" preload="false" />
   <texture name="Icon_Gear_Press" file_name="windows/Icon_Gear_Press.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 2e454cfed9..132a2d1dc5 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -117,11 +117,12 @@ color="DkGray"
              layout="topleft"
              left="0"
              name="friends_accordion"
-             top="2"
+             top="0"
              width="313">
                 <accordion_tab
                  can_resize="false"
                  layout="topleft"
+                 height="230"
                  min_height="150"
                  name="tab_online"
                  title="Online">
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 2a800f809b..7f72c7b0e9 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -317,8 +317,7 @@
      width="313">
         <button
          follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
+         height="23"
          label="Edit Profile"
          layout="topleft"
          left="0"
@@ -327,8 +326,7 @@
          width="130" />
         <button
          follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
+         height="23"
          label="Edit Appearance"
          layout="topleft"
          left_pad="5"
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index d3aeb00d53..6e837bcfee 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -1,99 +1,87 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- border="true"
+ border="false"
  follows="top|left"
  height="512"
+ top="0"
+ left="0"
  name="EstateWrapper"
  label="Estate"
  layout="topleft"
- width="280">
-  <scroll_container
-   follows="top|left|right|bottom"
-   height="508"
-   name="container1"
-   layout="topleft"
-   width="280">
+ width="313">
     <panel
      follows="top|left"
      height="950"
      label="Estate"
      layout="topleft"
      name="Estate"
-     width="258">
+     width="313">
       <panel.string
        name="email_unsupported">
         Feature unsupported
       </panel.string>
       <text
+       type="string"
+       length="1"
        follows="left|top"
        height="32"
        layout="topleft"
-       left="10"
+       left="0"
        name="estate_help_text"
-       top="14"
-       width="300">
+       top="5"
+       width="313">
         Changes to settings on this tab will affect all
         regions in the estate.
       </text>
       <text
+       type="string"
+       length="1"
        follows="left|top"
-       font="SansSerif"
-       height="20"
+
        layout="topleft"
-       left_delta="0"
        name="estate_text"
-       top_pad="2"
-       width="80">
+       top_pad="5"
+       width="313">
         Estate:
       </text>
       <text
+       type="string"
+       length="1"
        follows="left|top"
-       font="SansSerif"
-       height="20"
        layout="topleft"
-       left_delta="0"
        name="estate_name"
-       top_delta="16"
-       width="150">
+       top_pad="5"
+       width="313">
         (unknown)
       </text>
       <text
+       type="string"
+       length="1"
        follows="left|top"
-       font="SansSerif"
-       height="20"
        layout="topleft"
        left_delta="0"
        name="owner_text"
-       top_pad="2"
-       width="80">
-        Owner:
+       top_pad="5"
+       width="313">
+        Estate Owner:
       </text>
       <text
+       type="string"
+       length="1"
        follows="left|top"
-       font="SansSerif"
-       height="20"
        layout="topleft"
-       left_delta="0"
        name="estate_owner"
-       top_delta="16"
-       width="150">
+       top_pad="5"
+       width="313">
         (unknown)
       </text>
-      <view_border
-       bevel_style="in"
-       follows="top|left"
-       height="290"
-       layout="topleft"
-       left_delta="-4"
-       top_pad="5"
-       width="250" />
       <check_box
-       height="20"
+       height="23"
        label="Use Global Time"
        layout="topleft"
        left="12"
        name="use_global_time_check"
-       top="132"
+       top="102"
        width="200" />
       <button
        follows="left|top"
@@ -106,12 +94,12 @@
        top_delta="2"
        width="18" />
       <check_box
-       height="20"
+       height="23"
        label="Fixed Sun"
        layout="topleft"
        left="12"
        name="fixed_sun_check"
-       top="152"
+       top_pad="10"
        width="100" />
       <button
        follows="left|top"
@@ -124,16 +112,16 @@
        top_delta="2"
        width="18" />
       <icon
-       height="20"
+       height="23"
        image_name="icon_day_cycle.tga"
        layout="topleft"
        left="47"
        name="daycycle"
-       top="177"
+       top_pad="10"
        width="165" />
       <slider
        follows="left|top"
-       height="20"
+       height="23"
        increment="0.001"
        label="Phase"
        layout="topleft"
@@ -142,16 +130,15 @@
        min_val="6"
        name="sun_hour_slider"
        show_text="false"
-       top="202"
+       top_pad="10"
        width="200" />
       <check_box
-       height="20"
+       height="23"
        label="Allow Public Access"
        layout="topleft"
        left_delta="0"
        name="externally_visible_check"
-       top_pad="6"
-       width="200" />
+       top_pad="10" />
       <button
        follows="left|top"
        font="SansSerifSmall"
@@ -163,12 +150,14 @@
        top_delta="2"
        width="18" />
       <text
+       type="string"
+       length="1"
        follows="top|left"
        height="16"
        layout="topleft"
        left="32"
        name="Only Allow"
-       top="250"
+       top_pad="5"
        width="278">
         Restrict Access To:
       </text>
@@ -193,12 +182,12 @@
        top_pad="2"
        width="278" />
       <check_box
-       height="20"
+       height="23"
        label="Allow Voice Chat"
        layout="topleft"
        left="12"
        name="voice_chat_check"
-       top="304"
+       top_pad="5"
        width="200" />
       <button
        follows="left|top"
@@ -211,12 +200,12 @@
        top_delta="2"
        width="18" />
       <check_box
-       height="20"
+       height="23"
        label="Allow Direct Teleport"
        layout="topleft"
        left="12"
        name="allow_direct_teleport"
-       top_pad="4"
+       top_pad="0"
        width="80" />
       <button
        follows="left|top"
@@ -229,13 +218,15 @@
        top_delta="2"
        width="18" />
       <text
+       type="string"
+       length="1"
        follows="left|top"
-       height="20"
+       height="23"
        layout="topleft"
        left="10"
        name="abuse_email_text"
        top_pad="5"
-       width="180">
+       width="313">
         Abuse email address:
       </text>
       <line_editor
@@ -244,8 +235,8 @@
        layout="topleft"
        left="15"
        name="abuse_email_address"
-       top_pad="5"
-       width="205" />
+       top_pad="0"
+       width="250" />
       <button
        follows="left|top"
        font="SansSerifSmall"
@@ -259,7 +250,7 @@
       <button
        enabled="false"
        follows="left|top"
-       height="20"
+       height="23"
        label="Apply"
        layout="topleft"
        name="apply_btn"
@@ -268,7 +259,7 @@
        width="90" />
       <button
        follows="left|top"
-       height="20"
+       height="23"
        label="Send Message To Estate..."
        layout="topleft"
        left="8"
@@ -277,7 +268,7 @@
        width="250" />
       <button
        follows="left|top"
-       height="20"
+       height="23"
        label="Kick User from Estate..."
        layout="topleft"
        left="8"
@@ -285,9 +276,11 @@
        top_pad="5"
        width="250" />
       <text
+       type="string"
+       length="1"
        top="490"
        follows="left|top"
-       height="20"
+       height="23"
        layout="topleft"
        name="estate_manager_label"
        left="8"
@@ -304,26 +297,18 @@
        name="estate_manager_help"
        top_delta="-1"
        width="18" />
-      <view_border
-       bevel_style="none"
-       follows="top|left"
-       height="60"
-       layout="topleft"
-       left="8"
-       top_pad="5"
-       width="250" />
       <name_list
        follows="left|top"
        height="60"
        layout="topleft"
-       left_delta="0"
+       left="8"
        multi_select="true"
        name="estate_manager_name_list"
-       top_delta="0"
-       width="250" />
+       top_pad="0"
+       width="300" />
       <button
        follows="left|top"
-       height="20"
+       height="23"
        label="Add..."
        layout="topleft"
        left="8"
@@ -332,7 +317,7 @@
        width="90" />
       <button
        follows="left|top"
-       height="20"
+       height="23"
        label="Remove..."
        layout="topleft"
        name="remove_estate_manager_btn"
@@ -340,8 +325,10 @@
        top_delta="0"
        width="90" />
       <text
+       type="string"
+       length="1"
        follows="left|top"
-       height="20"
+       height="23"
        layout="topleft"
        left="8"
        name="allow_resident_label"
@@ -359,26 +346,18 @@
        name="allow_resident_help"
        top_delta="-1"
        width="18" />
-      <view_border
-       bevel_style="none"
-       follows="top|left"
-       height="60"
-       layout="topleft"
-       left="8"
-       top_pad="5"
-       width="250" />
       <name_list
        follows="left|top"
        height="60"
        layout="topleft"
-       left_delta="0"
+       left="8"
        multi_select="true"
        name="allowed_avatar_name_list"
-       top_delta="0"
-       width="250" />
+       top_pad="0"
+       width="300" />
       <button
        follows="left|top"
-       height="20"
+       height="23"
        label="Add..."
        layout="topleft"
        left="8"
@@ -387,7 +366,7 @@
        width="90" />
       <button
        follows="left|top"
-       height="20"
+       height="23"
        label="Remove..."
        layout="topleft"
        name="remove_allowed_avatar_btn"
@@ -395,8 +374,10 @@
        top_delta="0"
        width="90" />
       <text
+       type="string"
+       length="1"
        follows="left|top"
-       height="20"
+       height="23"
        layout="topleft"
        left="8"
        name="allow_group_label"
@@ -414,26 +395,18 @@
        name="allow_group_help"
        top_delta="-1"
        width="18" />
-      <view_border
-       bevel_style="none"
-       follows="top|left"
-       height="60"
-       layout="topleft"
-       left="8"
-       top_pad="5"
-       width="250" />
       <name_list
        follows="left|top"
        height="60"
        layout="topleft"
-       left_delta="0"
+       left="8"
        multi_select="true"
        name="allowed_group_name_list"
-       top_delta="0"
-       width="250" />
+       top_pad="0"
+       width="300" />
       <button
        follows="left|top"
-       height="20"
+       height="23"
        label="Add..."
        layout="topleft"
        left="8"
@@ -442,7 +415,7 @@
        width="90" />
       <button
        follows="left|top"
-       height="20"
+       height="23"
        label="Remove..."
        layout="topleft"
        name="remove_allowed_group_btn"
@@ -450,8 +423,10 @@
        top_delta="0"
        width="90" />
       <text
+       type="string"
+       length="1"
        follows="left|top"
-       height="20"
+       height="23"
        layout="topleft"
        left="8"
        name="ban_resident_label"
@@ -469,26 +444,18 @@
        name="ban_resident_help"
        top_delta="-1"
        width="18" />
-      <view_border
-       bevel_style="none"
-       follows="top|left"
-       height="60"
-       layout="topleft"
-       left="8"
-       top_pad="5"
-       width="250" />
       <name_list
        follows="left|top"
        height="60"
        layout="topleft"
-       left_delta="0"
+       left="8"
        multi_select="true"
        name="banned_avatar_name_list"
-       top_delta="0"
-       width="250" />
+       top_pad="0"
+       width="300" />
       <button
        follows="left|top"
-       height="20"
+       height="23"
        label="Add..."
        layout="topleft"
        left="8"
@@ -497,7 +464,7 @@
        width="90" />
       <button
        follows="left|top"
-       height="20"
+       height="23"
        label="Remove..."
        layout="topleft"
        name="remove_banned_avatar_btn"
@@ -505,5 +472,4 @@
        top_delta="0"
        width="90" />
     </panel>
-  </scroll_container>
 </panel>