summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorrichard <none@none>2010-01-07 18:38:28 -0800
committerrichard <none@none>2010-01-07 18:38:28 -0800
commit3a0b948bb355ab11f03173f3db06e63504ef0ac8 (patch)
tree3fae6aead5bfb369069afd00bdc06dcea34422f6 /indra/newview/skins/default/xui/en
parentf0c6d8c50ea4ae454d5d24ec61e8ac1efd728341 (diff)
parentc80d04cb0c863aae27efb420daad4718534538c1 (diff)
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/favorites_bar_button.xml8
-rw-r--r--indra/newview/skins/default/xui/en/floater_map.xml1
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml3
-rw-r--r--indra/newview/skins/default/xui/en/panel_my_profile.xml453
-rw-r--r--indra/newview/skins/default/xui/en/panel_navigation_bar.xml30
-rw-r--r--indra/newview/skins/default/xui/en/panel_notes.xml168
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile.xml427
-rw-r--r--indra/newview/skins/default/xui/en/panel_status_bar.xml22
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/en/widgets/location_input.xml20
10 files changed, 559 insertions, 575 deletions
diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
index dcf9847adb..dfb0695ec3 100644
--- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml
+++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
@@ -10,18 +10,16 @@
image_disabled_selected="transparent.j2c"
image_selected="transparent.j2c"
image_unselected="transparent.j2c"
- image_hover_selected="Favorite_Link_Over"
- image_hover_unselected="Favorite_Link_Over"
image_pressed="Favorite_Link_Over"
- image_pressed_selected="Favorite_Link_Over"
hover_glow_amount="0.15"
label_shadow="false"
layout="topleft"
left="0"
name="favorites_bar_btn"
- pad_bottom="-1"
+ pad_bottom="1"
pad_left="11"
- pad_right="7"
+ pad_right="9"
+ scale_image="true"
tab_stop="false"
top="0"
use_ellipses="true"
diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index 7b4c5f38a1..3a5ceed5fb 100644
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
+ can_minimize="false"
can_resize="true"
follows="top|right"
height="225"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 58e9d39807..fa7e3e86a3 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2816,8 +2816,7 @@
<menu_item_call
label="Dump Focus Holder"
layout="topleft"
- name="Dump Focus Holder"
- shortcut="control|alt|F">
+ name="Dump Focus Holder">
<menu_item_call.on_click
function="Advanced.DumpFocusHolder" />
</menu_item_call>
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 12a0a9155d..8327edfdd0 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -41,7 +41,7 @@
height="535"
width="313"
border_size="0">
- <panel
+ <layout_panel
name="profile_stack"
follows="all"
layout="topleft"
@@ -49,176 +49,176 @@
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
+ <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"
+ layout="topleft"
+ left="10"
+ name="second_life_image_panel"
+ top="0"
+ width="300">
+ <texture_picker
+ allow_no_texture="true"
+ default_image_name="None"
+ enabled="false"
+ follows="top|left"
+ height="117"
layout="topleft"
- follows="left|top|right"
- name="scroll_content_panel"
- top="0"
left="0"
- width="303">
- <panel
- follows="left|top|right"
- height="117"
- layout="topleft"
- left="10"
- name="second_life_image_panel"
- top="0"
- width="300">
- <texture_picker
- allow_no_texture="true"
- default_image_name="None"
- enabled="false"
- follows="top|left"
+ name="2nd_life_pic"
+ top="10"
+ width="102" />
+ <icon
+ height="102"
+ image_name="Blank"
+ layout="topleft"
+ name="2nd_life_edit_icon"
+ label=""
+ left="0"
+ tool_tip="Click the Edit Profile button below to change image"
+ top="10"
+ width="102" />
+ <text
+ follows="left|top|right"
+ font.style="BOLD"
+ height="15"
+ layout="topleft"
+ left_pad="10"
+ name="title_sl_descr_text"
+ text_color="white"
+ top_delta="0"
+ value="[SECOND_LIFE]:"
+ width="180" />
+ <expandable_text
+ follows="left|top|right"
+ height="95"
+ layout="topleft"
+ left="107"
+ textbox.max_length="512"
+ name="sl_description_edit"
+ top_pad="-3"
+ 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|right"
height="117"
layout="topleft"
- left="0"
- name="2nd_life_pic"
- top="10"
- width="102" />
- <icon
- height="102"
- image_name="Blank"
- layout="topleft"
- name="2nd_life_edit_icon"
- label=""
- left="0"
- tool_tip="Click the Edit Profile button below to change image"
- top="10"
- width="102" />
+ top_pad="10"
+ left="10"
+ name="first_life_image_panel"
+ width="300">
+ <texture_picker
+ allow_no_texture="true"
+ default_image_name="None"
+ enabled="false"
+ follows="top|left"
+ height="117"
+ layout="topleft"
+ left="0"
+ name="real_world_pic"
+ width="102" />
+ <icon
+ height="102"
+ image_name="Blank"
+ layout="topleft"
+ name="real_world_edit_icon"
+ label=""
+ left="0"
+ tool_tip="Click the Edit Profile button below to change image"
+ top="4"
+ width="102" />
+ <text
+ follows="left|top|right"
+ font.style="BOLD"
+ height="15"
+ layout="topleft"
+ left_pad="10"
+ name="title_rw_descr_text"
+ text_color="white"
+ top_delta="0"
+ value="Real World:"
+ width="180" />
+ <expandable_text
+ follows="left|top|right"
+ height="95"
+ layout="topleft"
+ left="107"
+ textbox.max_length="512"
+ name="fl_description_edit"
+ top_pad="-3"
+ 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
- follows="left|top|right"
- font.style="BOLD"
+ follows="left|top"
height="15"
+ font.style="BOLD"
+ font="SansSerifMedium"
layout="topleft"
- left_pad="10"
- name="title_sl_descr_text"
- text_color="white"
- top_delta="0"
- value="[SECOND_LIFE]:"
- width="180" />
- <expandable_text
- follows="left|top|right"
- height="95"
+ left="10"
+ name="homepage_edit"
+ top_pad="0"
+ value="http://librarianavengers.org"
+ width="300"
+ word_wrap="false"
+ use_ellipses="true"
+ />
+ <text
+ follows="left|top"
+ font.style="BOLD"
+ height="10"
layout="topleft"
- left="107"
- textbox.max_length="512"
- name="sl_description_edit"
- top_pad="-3"
- 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|right"
- height="117"
- layout="topleft"
- top_pad="10"
- left="10"
- name="first_life_image_panel"
- width="300">
- <texture_picker
- allow_no_texture="true"
- default_image_name="None"
- enabled="false"
- follows="top|left"
- height="117"
+ left="10"
+ name="title_member_text"
+ text_color="white"
+ top_pad="10"
+ value="Resident Since:"
+ width="300" />
+ <text
+ follows="left|top"
+ height="15"
layout="topleft"
- left="0"
- name="real_world_pic"
- width="102" />
- <icon
- height="102"
- image_name="Blank"
- layout="topleft"
- name="real_world_edit_icon"
- label=""
- left="0"
- tool_tip="Click the Edit Profile button below to change image"
- top="4"
- width="102" />
+ left="10"
+ name="register_date"
+ value="05/31/2376"
+ width="300"
+ word_wrap="true" />
<text
- follows="left|top|right"
- font.style="BOLD"
+ follows="left|top"
+ font.style="BOLD"
height="15"
layout="topleft"
- left_pad="10"
- name="title_rw_descr_text"
+ left="10"
+ name="title_acc_status_text"
text_color="white"
- top_delta="0"
- value="Real World:"
- width="180" />
- <expandable_text
- follows="left|top|right"
- height="95"
- layout="topleft"
- left="107"
- textbox.max_length="512"
- name="fl_description_edit"
- top_pad="-3"
- 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
- 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="300"
- word_wrap="false"
- use_ellipses="true"
- />
- <text
- follows="left|top"
- font.style="BOLD"
- height="10"
- layout="topleft"
- left="10"
- name="title_member_text"
- text_color="white"
- top_pad="10"
- value="Resident Since:"
- width="300" />
- <text
- follows="left|top"
- height="15"
- layout="topleft"
- left="10"
- name="register_date"
- value="05/31/2376"
- width="300"
- word_wrap="true" />
- <text
- follows="left|top"
- font.style="BOLD"
- height="15"
- layout="topleft"
- left="10"
- name="title_acc_status_text"
- text_color="white"
- top_pad="5"
- value="Account Status:"
- width="300" />
- <!-- <text
+ top_pad="5"
+ value="Account Status:"
+ width="300" />
+ <!-- <text
type="string"
follows="left|top"
font="SansSerifSmall"
@@ -229,75 +229,75 @@
top_delta="0"
value="Go to Dashboard"
width="100"/> -->
- <text
- follows="left|top"
- height="28"
- layout="topleft"
- left="10"
- name="acc_status_text"
- top_pad="0"
- width="300"
- word_wrap="true">
- Resident. No payment info on file.
-Linden.
- </text>
- <text
- follows="left|top"
- font.style="BOLD"
- height="15"
- layout="topleft"
- left="10"
- name="title_partner_text"
- text_color="white"
- top_pad="3"
- value="Partner:"
- width="300" />
- <panel
- follows="left|top"
- height="15"
- layout="topleft"
- left="10"
- name="partner_data_panel"
- top_pad="0"
- width="300">
+ <text
+ follows="left|top"
+ height="28"
+ layout="topleft"
+ left="10"
+ name="acc_status_text"
+ top_pad="0"
+ width="300"
+ word_wrap="true">
+ Resident. No payment info on file.
+ Linden.
+ </text>
<text
follows="left|top"
- height="10"
+ font.style="BOLD"
+ height="15"
layout="topleft"
- left="0"
- name="partner_text"
- top="0"
- value="[FIRST] [LAST]"
- width="300"
- word_wrap="true" />
- </panel>
- <text
- follows="left|top"
- font.style="BOLD"
- height="13"
- layout="topleft"
- left="10"
- name="title_groups_text"
- text_color="white"
- top_pad="3"
- value="Groups:"
- width="300" />
- <expandable_text
- follows="all"
- height="113"
- layout="topleft"
- left="7"
- name="sl_groups"
- 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>
- </scroll_container>
- </panel>
-<!-- <panel
+ left="10"
+ name="title_partner_text"
+ text_color="white"
+ top_pad="3"
+ value="Partner:"
+ width="300" />
+ <panel
+ follows="left|top"
+ height="15"
+ layout="topleft"
+ left="10"
+ name="partner_data_panel"
+ top_pad="0"
+ width="300">
+ <text
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left="0"
+ name="partner_text"
+ top="0"
+ value="[FIRST] [LAST]"
+ width="300"
+ word_wrap="true" />
+ </panel>
+ <text
+ follows="left|top"
+ font.style="BOLD"
+ height="13"
+ layout="topleft"
+ left="10"
+ name="title_groups_text"
+ text_color="white"
+ top_pad="3"
+ value="Groups:"
+ width="300" />
+ <expandable_text
+ follows="all"
+ height="113"
+ layout="topleft"
+ left="7"
+ name="sl_groups"
+ 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>
+ </scroll_container>
+ </layout_panel>
+ <!-- <layout_panel
follows="bottom|left"
layout="topleft"
left="0"
@@ -353,13 +353,14 @@ Linden.
top="5"
width="85" />
</panel>-->
- <panel
+ <layout_panel
follows="bottom|left"
layout="topleft"
left="0"
top_pad="0"
name="profile_me_buttons_panel"
visible="false"
+ auto_resize="false"
height="28"
width="313">
<button
@@ -379,6 +380,6 @@ Linden.
name="edit_appearance_btn"
tool_tip="Create/edit your appearance: physical data, clothes and etc."
width="130" />
- </panel>
+ </layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 0f9b095d8c..e2884dbedc 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -29,12 +29,12 @@
visible="false"
left="0"
top="0"
- height="60"
+ height="50"
width="600"/>
<panel
background_visible="false"
follows="left|top|right"
- top="5"
+ top="3"
height="23"
layout="topleft"
name="navigation_panel"
@@ -42,28 +42,17 @@
<button
follows="left|top"
height="23"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
image_overlay="Arrow_Left_Off"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
layout="topleft"
left="10"
name="back_btn"
tool_tip="Go back to previous location"
top="3"
width="31" />
-
<button
follows="left|top"
height="23"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
image_overlay="Arrow_Right_Off"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
layout="topleft"
left_pad="0"
name="forward_btn"
@@ -73,12 +62,7 @@
<button
follows="left|top"
height="23"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
image_overlay="Home_Off"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
layout="topleft"
left_pad="7"
name="home_btn"
@@ -146,7 +130,6 @@
name="search_combo_editor"/>
</search_combo_box>
</panel>
-
<favorites_bar
follows="left|right|top"
font="SansSerifSmall"
@@ -154,16 +137,17 @@
layout="topleft"
left="0"
name="favorite"
- image_drag_indication="arrow_down.tga"
- bottom="57"
+ image_drag_indication="Accordion_ArrowOpened_Off"
+ bottom="55"
width="590">
<chevron_button name=">>"
image_unselected="TabIcon_Close_Off"
image_selected="TabIcon_Close_Off"
tab_stop="false"
- follows="left|bottom"
- tool_tip="Show more of My Favorites"
+ follows="left|bottom"
+ tool_tip="Show more of My Favorites"
width="15"
+ top="15"
height="15"/>
</favorites_bar>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index 9335db0623..73528b28ad 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -19,94 +19,94 @@
height="517"
width="313"
border_size="0">
- <panel
- name="notes_stack"
+ <layout_panel
+ name="notes_stack"
+ follows="all"
+ layout="topleft"
+ top="0"
+ left="0"
+ height="475"
+ width="313">
+ <scroll_container
+ color="DkGray2"
follows="all"
layout="topleft"
- top="0"
left="0"
+ name="profile_scroll"
+ opaque="true"
height="475"
- width="313">
- <scroll_container
- color="DkGray2"
- follows="all"
+ width="313"
+ top="0">
+ <panel
+ height="450"
+ layout="topleft"
+ name="profile_scroll_panel"
+ top="0"
+ left="0"
+ width="303">
+ <text
+ follows="left|top"
+ font="SansSerifBold"
+ height="16"
layout="topleft"
- left="0"
- name="profile_scroll"
- opaque="true"
- height="475"
- width="313"
- top="0">
- <panel
- height="450"
- layout="topleft"
- name="profile_scroll_panel"
- top="0"
- left="0"
- width="303">
- <text
- follows="left|top"
- font="SansSerifBold"
- height="16"
- layout="topleft"
- left="10"
- name="status_message"
- text_color="white"
- top="20"
- value="My private notes:"
- width="293" />
- <text_editor
- follows="left|top"
- height="120"
- layout="topleft"
- left="10"
- max_length="1000"
- name="notes_edit"
- text_color="DkGray"
- top_pad="10"
- width="280"
- word_wrap="true" />
- <text
- follows="left|top"
- font="SansSerifBold"
- height="16"
- layout="topleft"
- left="10"
- name="status_message2"
- text_color="white"
- top_pad="30"
- value="Allow this person to:"
- width="293" />
- <check_box
- enabled="false"
- height="16"
- label="See my online status"
- layout="topleft"
- left="20"
- name="status_check"
- width="293" />
- <check_box
- enabled="false"
- height="16"
- label="See me on the map"
- layout="topleft"
- left="20"
- name="map_check"
- width="293" />
- <check_box
- enabled="false"
- height="16"
- label="Edit, delete or take my objects"
- layout="topleft"
- left="20"
- name="objects_check"
- width="293" />
- </panel>
- </scroll_container>
- </panel>
- <panel
- follows="bottom|left"
- height="30"
+ left="10"
+ name="status_message"
+ text_color="white"
+ top="20"
+ value="My private notes:"
+ width="293" />
+ <text_editor
+ follows="left|top"
+ height="120"
+ layout="topleft"
+ left="10"
+ max_length="1000"
+ name="notes_edit"
+ text_color="DkGray"
+ top_pad="10"
+ width="280"
+ word_wrap="true" />
+ <text
+ follows="left|top"
+ font="SansSerifBold"
+ height="16"
+ layout="topleft"
+ left="10"
+ name="status_message2"
+ text_color="white"
+ top_pad="30"
+ value="Allow this person to:"
+ width="293" />
+ <check_box
+ enabled="false"
+ height="16"
+ label="See my online status"
+ layout="topleft"
+ left="20"
+ name="status_check"
+ width="293" />
+ <check_box
+ enabled="false"
+ height="16"
+ label="See me on the map"
+ layout="topleft"
+ left="20"
+ name="map_check"
+ width="293" />
+ <check_box
+ enabled="false"
+ height="16"
+ label="Edit, delete or take my objects"
+ layout="topleft"
+ left="20"
+ name="objects_check"
+ width="293" />
+ </panel>
+ </scroll_container>
+ </layout_panel>
+ <layout_panel
+ follows="bottom|left"
+ height="30"
layout="topleft"
left="0"
name="notes_buttons_panel"
@@ -164,6 +164,6 @@
left_pad="3"
top="5"
width="80" />
- </panel>
+ </layout_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 5ccc964c9a..43947262ec 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -38,10 +38,10 @@
layout="topleft"
left="0"
top="0"
- height="535"
+ height="517"
width="313"
border_size="0">
- <panel
+ <layout_panel
name="profile_stack"
follows="all"
layout="topleft"
@@ -49,156 +49,156 @@
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
+ <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"
+ layout="topleft"
+ left="10"
+ name="second_life_image_panel"
+ top="0"
+ width="303">
+ <texture_picker
+ allow_no_texture="true"
+ default_image_name="None"
+ enabled="false"
+ follows="top|left"
+ height="117"
layout="topleft"
- follows="left|top|right"
- name="profile_scroll_panel"
- top="0"
left="0"
- width="303">
- <panel
- follows="left|top|right"
- height="117"
- layout="topleft"
- left="10"
- name="second_life_image_panel"
- top="0"
- width="303">
- <texture_picker
- allow_no_texture="true"
- default_image_name="None"
- enabled="false"
- follows="top|left"
+ name="2nd_life_pic"
+ top="10"
+ width="102" />
+ <text
+ follows="left|top|right"
+ font.style="BOLD"
+ height="15"
+ layout="topleft"
+ left_pad="10"
+ name="title_sl_descr_text"
+ text_color="white"
+ top_delta="0"
+ value="[SECOND_LIFE]:"
+ width="180" />
+ <expandable_text
+ follows="left|top|right"
+ height="95"
+ layout="topleft"
+ left="107"
+ textbox.max_length="512"
+ name="sl_description_edit"
+ top_pad="-3"
+ 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.
+ </expandable_text>
+ </panel>
+ <panel
+ follows="left|top|right"
height="117"
layout="topleft"
- left="0"
- name="2nd_life_pic"
- top="10"
- width="102" />
+ top_pad="10"
+ left="10"
+ name="first_life_image_panel"
+ width="303">
+ <texture_picker
+ allow_no_texture="true"
+ default_image_name="None"
+ enabled="false"
+ follows="top|left"
+ height="117"
+ layout="topleft"
+ left="0"
+ name="real_world_pic"
+ width="102" />
+ <text
+ follows="left|top|right"
+ font.style="BOLD"
+ height="15"
+ layout="topleft"
+ left_pad="10"
+ name="title_rw_descr_text"
+ text_color="white"
+ top_delta="0"
+ value="Real World:"
+ width="180" />
+ <expandable_text
+ follows="left|top|right"
+ height="95"
+ layout="topleft"
+ left="107"
+ textbox.max_length="512"
+ name="fl_description_edit"
+ top_pad="-3"
+ 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.
+ </expandable_text>
+ </panel>
<text
- follows="left|top|right"
- font.style="BOLD"
- height="15"
+ 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="300"
+ word_wrap="false"
+ use_ellipses="true"
+ />
+ <text
+ follows="left|top"
+ font.style="BOLD"
+ height="10"
layout="topleft"
- left_pad="10"
- name="title_sl_descr_text"
+ left="10"
+ name="title_member_text"
text_color="white"
- top_delta="0"
- value="[SECOND_LIFE]:"
- width="180" />
- <expandable_text
- follows="left|top|right"
- height="95"
- layout="topleft"
- left="107"
- textbox.max_length="512"
- name="sl_description_edit"
- top_pad="-3"
- 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.
- </expandable_text>
- </panel>
- <panel
- follows="left|top|right"
- height="117"
- layout="topleft"
- top_pad="10"
- left="10"
- name="first_life_image_panel"
- width="303">
- <texture_picker
- allow_no_texture="true"
- default_image_name="None"
- enabled="false"
- follows="top|left"
- height="117"
+ top_pad="10"
+ value="Resident Since:"
+ width="300" />
+ <text
+ follows="left|top"
+ height="15"
layout="topleft"
- left="0"
- name="real_world_pic"
- width="102" />
+ left="10"
+ name="register_date"
+ value="05/31/2376"
+ width="300"
+ word_wrap="true" />
<text
- follows="left|top|right"
- font.style="BOLD"
+ follows="left|top"
+ font.style="BOLD"
height="15"
layout="topleft"
- left_pad="10"
- name="title_rw_descr_text"
+ left="10"
+ name="title_acc_status_text"
text_color="white"
- top_delta="0"
- value="Real World:"
- width="180" />
- <expandable_text
- follows="left|top|right"
- height="95"
- layout="topleft"
- left="107"
- textbox.max_length="512"
- name="fl_description_edit"
- top_pad="-3"
- 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.
- </expandable_text>
- </panel>
- <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="300"
- word_wrap="false"
- use_ellipses="true"
- />
- <text
- follows="left|top"
- font.style="BOLD"
- height="10"
- layout="topleft"
- left="10"
- name="title_member_text"
- text_color="white"
- top_pad="10"
- value="Resident Since:"
- width="300" />
- <text
- follows="left|top"
- height="15"
- layout="topleft"
- left="10"
- name="register_date"
- value="05/31/2376"
- width="300"
- word_wrap="true" />
- <text
- follows="left|top"
- font.style="BOLD"
- height="15"
- layout="topleft"
- left="10"
- name="title_acc_status_text"
- text_color="white"
- top_pad="5"
- value="Account Status:"
- width="300" />
- <!-- <text
+ top_pad="5"
+ value="Account Status:"
+ width="300" />
+ <!-- <text
type="string"
follows="left|top"
font="SansSerifSmall"
@@ -209,79 +209,80 @@
top_delta="0"
value="Go to Dashboard"
width="100"/> -->
- <text
- follows="left|top"
- height="28"
- layout="topleft"
- left="10"
- name="acc_status_text"
- top_pad="0"
- width="300"
- word_wrap="true">
- Resident. No payment info on file.
-Linden.
- </text>
- <text
- follows="left|top"
- font.style="BOLD"
- height="15"
- layout="topleft"
- left="10"
- name="title_partner_text"
- text_color="white"
- top_pad="3"
- value="Partner:"
- width="300" />
- <panel
- follows="left|top"
- height="15"
- layout="topleft"
- left="10"
- name="partner_data_panel"
- top_pad="0"
- width="300">
<text
follows="left|top"
- height="10"
+ height="28"
layout="topleft"
- left="0"
- name="partner_text"
- top="0"
- value="[FIRST] [LAST]"
- width="300"
- word_wrap="true" />
- </panel>
- <text
- follows="left|top"
- font.style="BOLD"
- height="13"
- layout="topleft"
- left="10"
- name="title_groups_text"
- text_color="white"
- top_pad="3"
- value="Groups:"
- width="300" />
- <expandable_text
- follows="all"
- height="113"
- layout="topleft"
- left="7"
- name="sl_groups"
- 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>
- </scroll_container>
-</panel>
- <panel
- follows="bottom|left"
+ left="10"
+ name="acc_status_text"
+ top_pad="0"
+ width="300"
+ word_wrap="true">
+ Resident. No payment info on file.
+ Linden.
+ </text>
+ <text
+ follows="left|top"
+ font.style="BOLD"
+ height="15"
+ layout="topleft"
+ left="10"
+ name="title_partner_text"
+ text_color="white"
+ top_pad="3"
+ value="Partner:"
+ width="300" />
+ <panel
+ follows="left|top"
+ height="15"
+ layout="topleft"
+ left="10"
+ name="partner_data_panel"
+ top_pad="0"
+ width="300">
+ <text
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left="0"
+ name="partner_text"
+ top="0"
+ value="[FIRST] [LAST]"
+ width="300"
+ word_wrap="true" />
+ </panel>
+ <text
+ follows="left|top"
+ font.style="BOLD"
+ height="13"
+ layout="topleft"
+ left="10"
+ name="title_groups_text"
+ text_color="white"
+ top_pad="3"
+ value="Groups:"
+ width="300" />
+ <expandable_text
+ follows="all"
+ height="113"
+ layout="topleft"
+ left="7"
+ name="sl_groups"
+ 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>
+ </scroll_container>
+ </layout_panel>
+ <layout_panel
+ follows="bottom|left"
height="28"
layout="topleft"
name="profile_buttons_panel"
+ auto_resize="false"
width="313">
<button
follows="bottom|left"
@@ -346,15 +347,14 @@ Linden.
top="5"
left_pad="3"
width="23" />-->
- </panel>
- <panel
+ </layout_panel>
+ <layout_panel
follows="bottom|left"
height="28"
layout="topleft"
- top_pad="-26"
name="profile_me_buttons_panel"
visible="false"
- width="313">
+ width="313">
<button
follows="bottom|right"
height="23"
@@ -372,6 +372,7 @@ Linden.
name="edit_appearance_btn"
tool_tip="Create/edit your appearance: physical data, clothes and etc."
width="130" />
- </panel>
- </layout_stack>
+ </layout_panel>
+
+</layout_stack>
</panel> \ No newline at end of file
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 3578c4326d..00f54feabd 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -3,7 +3,7 @@
background_opaque="true"
background_visible="true"
bg_opaque_color="MouseGray"
- follows="all"
+ follows="top|right"
height="19"
layout="topleft"
left="0"
@@ -44,15 +44,17 @@
halign="right"
follows="right|top"
image_selected="BuyArrow_Over"
- image_unselected="BuyArrow_Off"
+ image_unselected="BuyArrow_Over"
image_pressed="BuyArrow_Press"
height="16"
- right="-120"
+ right="-128"
+ label_color="White"
+ label_shadow="false"
name="buycurrency"
pad_right="20px"
tool_tip="My Balance: Click to buy more L$"
- top="0"
- width="90" />
+ top="3"
+ width="100" />
<text
type="string"
font="SansSerifSmall"
@@ -62,25 +64,25 @@
height="16"
top="4"
layout="topleft"
- left_pad="-7"
+ left_pad="0"
name="TimeText"
text_color="TimeTextColor"
tool_tip="Current time (Pacific)"
- width="80">
+ width="85">
12:00 AM
</text>
<button
follows="right|bottom"
height="16"
- image_selected="Parcel_VoiceNo_Dark"
- image_unselected="Parcel_Voice_Dark"
+ image_selected="AudioMute_Off"
+ image_pressed="Audio_Press"
+ image_unselected="Audio_Off"
is_toggle="true"
left_pad="18"
top="1"
name="volume_btn"
tool_tip="Global Volume Control"
width="16" />
-
<text
enabled="true"
follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index b738e72423..51974be854 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -28,7 +28,7 @@
name="panel_main_inventory"
top="0"
label=""
- height="500"
+ height="545"
width="330" />
<panel
height="25"
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 1368c6826d..67bb7c1896 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -3,15 +3,12 @@
*TODO: Replace hardcoded buttons width/height with getting this info from the button images.
Currently that doesn't work because LLUIImage::getWidth/getHeight() return 1 for the images.
-->
-
-
-
<location_input font="SansSerifSmall"
add_landmark_image_enabled="Favorite_Star_Active"
add_landmark_image_disabled="Favorite_Star_Off"
add_landmark_image_hover="Favorite_Star_Over"
add_landmark_image_selected="Favorite_Star_Press"
- add_landmark_hpad="12"
+ add_landmark_hpad="12"
icon_hpad="2"
allow_text_entry="true"
list_position="below"
@@ -26,8 +23,8 @@
name="Place Information"
width="16"
height="16"
- left="4"
- top="20"
+ left="6"
+ top="20"
follows="left|top"
hover_glow_amount="0.15"
image_unselected="Info_Off"
@@ -55,7 +52,7 @@
top="21"
/>
<voice_icon
- enabled="true"
+ enabled="true"
name="voice_icon"
width="22"
height="18"
@@ -97,11 +94,12 @@
/>
<damage_icon
name="damage_icon"
- width="20"
- height="16"
- top="20"
+ width="14"
+ height="13"
+ top="22"
+ left="2"
follows="right|top"
- image_name="Parcel_Damage_Light"
+ image_name="Parcel_Damage_Dark"
/>
<!-- Default text color is invisible on top of nav bar background -->
<damage_text