summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/de/floater_water.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-05-26 20:25:56 -0400
committerOz Linden <oz@lindenlab.com>2011-05-26 20:25:56 -0400
commit01ec64a1bc88ed0b1a18c559c136b32476309100 (patch)
tree13257b39e274c62840c54a06616b7213dedbfeb6 /indra/newview/skins/default/xui/de/floater_water.xml
parent0f02f6784d0bc2a9cf72674da0b7bf2262ca8b58 (diff)
parentdc9aa56f6617ae1f5eaf46ba7b1596aca07d4f84 (diff)
merge changes for latest viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/de/floater_water.xml')
-rw-r--r--indra/newview/skins/default/xui/de/floater_water.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/de/floater_water.xml b/indra/newview/skins/default/xui/de/floater_water.xml
index 097a60a444..bb0dd9c75d 100644
--- a/indra/newview/skins/default/xui/de/floater_water.xml
+++ b/indra/newview/skins/default/xui/de/floater_water.xml
@@ -3,9 +3,10 @@
<floater.string name="WLDefaultWaterNames">
Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
</floater.string>
- <text name="KeyFramePresetsText" width="116">
+ <text name="KeyFramePresetsText" width="110">
Voreinstellungen:
</text>
+ <combo_box left_delta="110" name="WaterPresetsCombo"/>
<button label="Neu" label_selected="Neu" name="WaterNewPreset"/>
<button label="Speichern" label_selected="Speichern" name="WaterSavePreset"/>
<button label="Löschen" label_selected="Löschen" name="WaterDeletePreset"/>