diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-19 10:18:57 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-19 10:18:57 -0400 |
| commit | 5b8c1851f2b565fddaab28e23add62f621f15082 (patch) | |
| tree | d8525d0f5dd985efb86dcb50e752e19d59a7fb2d /indra/newview/skins/default/xui/de | |
| parent | 94fde578cd845b1a648e66ecf184e7a24beaad6d (diff) | |
| parent | 3bb5d368a21e2645222f0f5fa57b0a0abb236084 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/skins/default/xui/de')
| -rw-r--r-- | indra/newview/skins/default/xui/de/menu_object.xml | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/de/panel_nearby_media.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/de/menu_object.xml b/indra/newview/skins/default/xui/de/menu_object.xml index 8bb7b66482..756b606d65 100644 --- a/indra/newview/skins/default/xui/de/menu_object.xml +++ b/indra/newview/skins/default/xui/de/menu_object.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Object Pie"> - <menu_item_call label="Berühren" name="Object Touch"/> + <menu_item_call label="Berühren" name="Object Touch"> + <on_enable parameter="Berühren" name="EnableTouch"/> + </menu_item_call> <menu_item_call label="Bearbeiten" name="Edit..."/> <menu_item_call label="Bauen" name="Build"/> <menu_item_call label="Öffnen" name="Open"/> diff --git a/indra/newview/skins/default/xui/de/panel_nearby_media.xml b/indra/newview/skins/default/xui/de/panel_nearby_media.xml index e633ae1dde..7c819c28af 100644 --- a/indra/newview/skins/default/xui/de/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/de/panel_nearby_media.xml @@ -36,7 +36,7 @@ <scroll_list.columns label="Name" name="media_name"/> <scroll_list.columns label="Fehler beseitigen" name="media_debug"/> </scroll_list> - <panel> + <panel name="media_controls_panel"> <layout_stack name="media_controls"> <layout_panel name="stop"> <button name="stop_btn" tool_tip="Ausgewählte Medien stoppen"/> |