diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
| commit | a65188d85f75e848d224bd335a00ed8aa51f945e (patch) | |
| tree | f43b390cba45d047fc0fa31659f6969f62b925d1 /indra/newview/skins/default/xui/de/panel_edit_jacket.xml | |
| parent | 1a8008ea150d1eb9a8f4036988ef971fb1901cb3 (diff) | |
| parent | 5ca943cd0279d35ffdf584fa0de3b795645f276c (diff) | |
Merge from viewer2. Minor conflict resolved.
Diffstat (limited to 'indra/newview/skins/default/xui/de/panel_edit_jacket.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/de/panel_edit_jacket.xml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/skins/default/xui/de/panel_edit_jacket.xml b/indra/newview/skins/default/xui/de/panel_edit_jacket.xml index 7776eb24bb..3752faf48a 100644 --- a/indra/newview/skins/default/xui/de/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_jacket.xml @@ -1,11 +1,11 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="edit_jacket_panel">
- <panel name="avatar_jacket_color_panel">
- <texture_picker label="Oberstoff" name="Upper Fabric" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
- <texture_picker label="Unterstoff" name="Lower Fabric" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
- <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
- </panel>
- <accordion name="wearable_accordion">
- <accordion_tab name="jacket_main_tab" title="Jacke"/>
- </accordion>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_jacket_panel"> + <panel name="avatar_jacket_color_panel"> + <texture_picker label="Oberstoff" name="Upper Fabric" tool_tip="Zum Auswählen eines Bildes hier klicken"/> + <texture_picker label="Unterstoff" name="Lower Fabric" tool_tip="Zum Auswählen eines Bildes hier klicken"/> + <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="jacket_main_tab" title="Jacke"/> + </accordion> +</panel> |