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: 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.

---
 .../skins/default/textures/icons/Icon_For_Sale.png | Bin 0 -> 6654 bytes
 indra/newview/skins/default/textures/textures.xml  |   4 +-
 .../newview/skins/default/xui/en/panel_people.xml  |   3 +-
 .../newview/skins/default/xui/en/panel_profile.xml |   6 +-
 .../skins/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

(limited to 'indra/newview/skins')

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 0000000000..01e8697138
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Icon_For_Sale.png differ
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>
-- 
cgit v1.2.3