diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-19 10:04:23 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-19 10:04:23 +0100 |
| commit | 02fe5d60c0a6664bb86254347ce31467da2d90c3 (patch) | |
| tree | fe1420806e453a14a63b4f16ad2d566a8c9a0d1a /indra/newview/skins/default/xui/en/floater_avatar_textures.xml | |
| parent | cd0ab5b41eda85b9cb4855f61c3f7e4ca5150797 (diff) | |
| parent | b550bb0f09197c35b80d18d540761a7831c3e89b (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_avatar_textures.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_avatar_textures.xml | 50 |
1 files changed, 32 insertions, 18 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml index e30e958543..119dd63a17 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml @@ -1,16 +1,39 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - height="660" + height="990" layout="topleft" name="avatar_texture_debug" help_topic="avatar_texture_debug" title="AVATAR TEXTURES" - width="1253"> + width="1240" + can_resize="true"> <floater.string name="InvalidAvatar"> INVALID AVATAR </floater.string> + + <scroll_container + color="DkGray2" + opaque="true" + follows="all" + height="970" + layout="topleft" + left="5" + top_pad="15" + name="profile_scroll" + reserve_scroll_corner="false" + width="1235"> + <panel + name="scroll_content_panel" + follows="left|top" + min_height="300" + layout="topleft" + top="0" + background_visible="false" + height="950" + left="0" + width="1230"> <text type="string" length="1" @@ -18,7 +41,7 @@ layout="topleft" left="30" name="label" - top="40" + top="20" width="80"> Baked Textures </text> @@ -43,27 +66,17 @@ top_delta="0" width="150" /> - <scroll_container - color="DkGray2" - opaque="true" - follows="all" - height="590" - layout="topleft" - left="5" - top_pad="5" - name="profile_scroll" - reserve_scroll_corner="false" - width="1240"> <panel name="scroll_content_panel" follows="left|top" min_height="300" layout="topleft" - top="0" + top="43" background_visible="false" - height="950" + height="930" left="0" - width="1250"> + width="1230"> + <texture_picker height="143" label="Hair" @@ -302,5 +315,6 @@ top_delta="0" width="128" /> </panel> +</panel> </scroll_container> -</floater> +</floater>
\ No newline at end of file |