livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge STORM-89

meow-7.2.2
Tofu Linden 2010-09-10 17:47:05 +01:00
parent 064f30d1d2 4c2b8ecf65
commit 02fac56357
7 changed files with 52 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
View File

@ -84,7 +84,7 @@ background_visible="true"
follows="all"
left="8"
top_pad="0"
height="536"
height="506"
width="292"
border_size="0">
<layout_panel
@ -176,15 +176,27 @@ background_visible="true"
</accordion_tab>
</accordion>
</layout_panel>
<layout_panel
</layout_stack>
<layout_stack
name="layout"
orientation="horizontal"
follows="bottom|left|right"
left="8"
top_pad="0"
height="30"
width="292"
border_size="0">
<layout_panel
height="30"
layout="topleft"
auto_resize="false"
left="0"
top_pad="0"
name="button_row"
follows="bottom|left|right"
width="313">
name="button_row"
follows="bottom|left|right"
width="313">
<layout_stack
follows="bottom|left|right"
@ -307,5 +319,7 @@ background_visible="true"
visible="false"
width="65" />-->
</layout_panel>
</layout_stack>
</layout_stack>
</panel>

2
indra/newview/skins/default/xui/en/panel_me.xml
View File

@ -26,7 +26,7 @@
</text> -->
<tab_container
follows="all"
height="575"
height="555"
halign="center"
layout="topleft"
left="5"

75
indra/newview/skins/default/xui/en/panel_my_profile.xml
View File

@ -41,7 +41,7 @@
layout="topleft"
left="0"
top="0"
height="522"
height="510"
width="315"
border_size="0">
<layout_panel
@ -324,82 +324,25 @@
</panel>
</scroll_container>
</layout_panel>
<!-- <layout_panel
follows="bottom|left"
</layout_stack>
<panel
follows="bottom|left|right"
height="23"
layout="topleft"
left="0"
name="profile_buttons_panel"
height="28"
width="313">
<button
follows="bottom|left"
height="23"
label="Add Friend"
layout="topleft"
left="0"
mouse_opaque="false"
name="add_friend"
tool_tip="Offer friendship to the Resident"
top="5"
width="80" />
<button
follows="bottom|left"
height="23"
label="IM"
layout="topleft"
name="im"
top="5"
left_pad="3"
width="45" />
<button
follows="bottom|left"
height="23"
label="Call"
layout="topleft"
name="call"
left_pad="3"
top="5"
width="45" />
<button
enabled="false"
follows="bottom|left"
height="23"
label="Map"
layout="topleft"
name="show_on_map_btn"
top="5"
left_pad="3"
width="45" />
<button
follows="bottom|left"
height="23"
label="Teleport"
layout="topleft"
name="teleport"
left_pad="3"
top="5"
width="85" />
</panel>-->
<layout_panel
follows="bottom|left"
layout="topleft"
left="0"
top_pad="0"
top_pad="1"
name="profile_me_buttons_panel"
visible="false"
user_resize="false"
auto_resize="false"
height="28"
width="315">
<button
follows="bottom"
height="23"
left="6"
top="1"
top="1"
label="Edit Profile"
name="edit_profile_btn"
tool_tip="Edit your personal information"
width="152" />
</layout_panel>
</layout_stack>
</panel>
</panel>

2
indra/newview/skins/default/xui/en/panel_notes.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="all"
height="533"
height="515"
label="Notes &amp; Privacy"
layout="topleft"
left="0"

2
indra/newview/skins/default/xui/en/panel_picks.xml
View File

@ -30,7 +30,7 @@ bg_opaque_color="DkGray2"
<accordion
fit_parent="true"
follows="all"
height="470"
height="485"
layout="topleft"
left="0"
name="accordion"

24
indra/newview/skins/default/xui/en/panel_profile.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="all"
height="540"
height="430"
label="Profile"
layout="topleft"
left="0"
@ -41,7 +41,7 @@
layout="topleft"
left="0"
top="0"
height="524"
height="400"
width="317"
border_size="0">
<layout_panel
@ -50,7 +50,7 @@
layout="topleft"
top="0"
left="0"
height="524"
height="400"
width="317">
<scroll_container
color="DkGray2"
@ -304,11 +304,25 @@
</panel>
</scroll_container>
</layout_panel>
<layout_panel
</layout_stack>
<layout_stack
name="layout_verb_buttons"
orientation="horizontal"
follows="bottom|left|right"
layout="topleft"
left="2"
top_pad="1"
height="30"
width="315"
border_size="0">
<layout_panel
follows="bottom|left"
height="30"
layout="topleft"
name="profile_buttons_panel"
top="0"
auto_resize="false"
width="317">
@ -448,6 +462,6 @@
tool_tip="Edit your personal information"
width="130" />
</layout_panel>
</layout_stack>
</layout_stack>
</panel>

2
indra/newview/skins/default/xui/en/panel_profile_view.xml
View File

@ -56,7 +56,7 @@
width="150" />
<tab_container
follows="all"
height="538"
height="515"
halign="center"
layout="topleft"
left="5"