diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-02-03 10:32:05 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-02-03 10:32:05 -0500 |
commit | 957b8b15e1dc799c6f9b1c8dd42903f4c3f911f8 (patch) | |
tree | d9c99b4ea080a97ae6506bcec4c9859ea989271e /indra/newview/skins/default/xui/da/panel_edit_alpha.xml | |
parent | 5bd5d918caa63338a678e2c94db9195f77867e8a (diff) | |
parent | b15b43b14e2e2d1afd602e3c7e3cfbfb15716a03 (diff) |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/skins/default/xui/da/panel_edit_alpha.xml')
-rw-r--r-- | indra/newview/skins/default/xui/da/panel_edit_alpha.xml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/da/panel_edit_alpha.xml b/indra/newview/skins/default/xui/da/panel_edit_alpha.xml index 3826e8a228..0f60a6df51 100644 --- a/indra/newview/skins/default/xui/da/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_alpha.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_alpha_panel"> - <panel name="avatar_alpha_color_panel"> - <texture_picker label="Alpha - nedre" name="Lower Alpha" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Alpha - øvre" name="Upper Alpha" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Alpha - hoved" name="Head Alpha" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Alpha - øje" name="Eye Alpha" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Alpha - hår" name="Hair Alpha" tool_tip="Klik for at vælge et billede"/> - </panel> + <scroll_container name="avatar_alpha_color_panel_scroll"> + <panel name="avatar_alpha_color_panel"> + <texture_picker label="Nedre alpha" name="Lower Alpha" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Øverste alpha" name="Upper Alpha" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Hovede alpha" name="Head Alpha" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Øje alpha" name="Eye Alpha" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Hår alpha" name="Hair Alpha" tool_tip="Klik for at vælge et billede"/> + </panel> + </scroll_container> </panel> |