summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/da/panel_edit_alpha.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-16 18:24:03 -0500
committerOz Linden <oz@lindenlab.com>2011-02-16 18:24:03 -0500
commit75f7aca1079468eb8655c5726318cc3a7aa85c16 (patch)
treecabf8ba08a2cb0b1da360798c0937e840bf42590 /indra/newview/skins/default/xui/da/panel_edit_alpha.xml
parent8af932de1f006d518ddfcf44c8cc2cab344dc802 (diff)
parentbf7801aeec041fd162599b1b394780ef0e32fe9c (diff)
Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
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.xml16
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>