diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-07 12:22:00 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-07 12:22:00 -0700 |
| commit | 1965e32238927ee675253af412223d36fe19d803 (patch) | |
| tree | 61ff961ca846dc2d8d698725481db5c019e67d01 /indra/newview/skins/default | |
| parent | 3ba9bd536b036fda89d467729870cfac0c5727b8 (diff) | |
| parent | ca2f043ffeb0b6f7c0a5ea171411c45f6dcc0bf4 (diff) | |
Merge
Diffstat (limited to 'indra/newview/skins/default')
4 files changed, 47 insertions, 16 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml new file mode 100644 index 0000000000..a0c1f4c021 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_avatar.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="225" + can_minimize="true" + can_close="true" + user_resize="true" + can_resize="true" + min_height="230" + min_width="455" + max_height="230" + height="230" + layout="topleft" + name="Avatar" + single_instance="true" + help_topic="avatar" + save_rect="true" + title="Avatar Picker" + width="445"> + <web_browser + top="25" + height="200" + width="435" + follows="all" + name="avatar_picker_contents" + trusted_content="true"/> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml index 50a279c046..9dd9338f37 100644 --- a/indra/newview/skins/default/xui/en/floater_destinations.xml +++ b/indra/newview/skins/default/xui/en/floater_destinations.xml @@ -6,6 +6,8 @@ user_resize="true" can_resize="true" min_height="230" + min_width="525" + max_height="230" height="230" layout="topleft" name="Destinations" diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index cf566d7d23..57baa7cdd3 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -90,15 +90,6 @@ top="0" visible="false" width="1024"/> - <panel bottom="500" - follows="left|right|bottom" - height="25" - left="0" - mouse_opaque="false" - tab_stop="false" - name="stand_stop_flying_container" - visible="false" - width="500"/> </layout_panel> <!--<layout_panel auto_resize="false" min_height="33" diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml index 44da813f61..03d45887d4 100644 --- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml +++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml @@ -41,10 +41,10 @@ <toolbar follows="left|top|bottom" button_panel.bg_opaque_image="Rounded_Rect_Right" name="toolbar_left" - height="500" width="30" left="0" - top="0" + top="10" + bottom="-10" side="left" button_display_mode="icons_only"> </toolbar> @@ -52,7 +52,19 @@ <layout_panel name="non_toolbar_panel" auto_resize="true" user_resize="false" - mouse_opaque="false"/> + mouse_opaque="false" + height="100" + width="100"> + <panel bottom="100" + follows="left|right|bottom" + height="25" + left="0" + mouse_opaque="false" + tab_stop="false" + name="stand_stop_flying_container" + visible="false" + width="100"/> + </layout_panel> <layout_panel name="right_toolbar_panel" auto_resize="false" user_resize="false" @@ -63,10 +75,10 @@ button_panel.bg_opaque_image="Rounded_Rect_Left" follows="right|top|bottom" name="toolbar_right" - height="500" width="30" left="0" - top="0" + top="10" + bottom="-10" side="right" button_display_mode="icons_only"> </toolbar> @@ -83,8 +95,8 @@ button_panel.bg_opaque_image="Rounded_Rect_Top" name="toolbar_bottom" height="30" - width="1024" - left="0" + left="40" + right="-40" top="0" side="bottom" follows="left|right|bottom" |