diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 12:24:15 -0800 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 12:24:15 -0800 |
| commit | 187b21e6d22204e8989b1c7d5e75f8b7880dd79f (patch) | |
| tree | 8f60e069433afa48fc9a20ecc165863a0108c1aa /indra/newview/skins/default/xui/de/panel_preferences_setup.xml | |
| parent | e3677f9ee2223cc13d12456e1eee4f7f9a90c474 (diff) | |
| parent | 5b86f60a13f28f5978ff3a53371cb3bae7f0d837 (diff) | |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/de/panel_preferences_setup.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/de/panel_preferences_setup.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml index 02c6fb0606..140b1ce7a4 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Hardware/Internet" name="Input panel"> - <button label="Andere Geräte" name="joystick_setup_button"/> <text name="Mouselook:"> Mouselook: </text> @@ -40,6 +39,7 @@ <check_box initial_value="true" label="Plugins aktivieren" name="browser_plugins_enabled"/> <check_box initial_value="true" label="Cookies annehmen" name="cookies_enabled"/> <check_box initial_value="true" label="Javascript aktivieren" name="browser_javascript_enabled"/> + <check_box initial_value="false" label="Medienbrowser-Popups aktivieren" name="media_popup_enabled"/> <check_box initial_value="false" label="Web-Proxy aktivieren" name="web_proxy_enabled"/> <text name="Proxy location"> Proxy-Standort: |