diff options
| author | angela <angela@lindenlab.com> | 2009-11-10 01:04:52 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-10 01:04:52 +0800 |
| commit | b423ea58ca2fe4f9be36fa7b3e70017bc7e8368d (patch) | |
| tree | cd83e2e4e265cf30f2209c53b5ff6da721fdfb94 /indra | |
| parent | f8a010e4dd136aba5443b68a367fe39bd1b1ba33 (diff) | |
fix xml function param problem and adding missing settings in settings.xml
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 28 |
2 files changed, 17 insertions, 22 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6f6d5fb979..55ff255c38 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3598,6 +3598,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>HideSelectedObjects</key> + <map> + <key>Comment</key> + <string>Hide Selected Objects</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>HtmlHelpLastPage</key> <map> <key>Comment</key> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 66c9060b06..dbc9601680 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1932,18 +1932,15 @@ function="Advanced.ToggleConsole" parameter="debug" /> </menu_item_check> - <menu_item_check + <menu_item_call label="Notifications Console" layout="topleft" name="Notifications" shortcut="control|shift|5"> - <menu_item_check.on_check - function="Advanced.CheckConsole" - parameter="notifications" /> - <menu_item_check.on_click - function="Floater.Show" + <menu_item_call.on_click + function="Floater.Toggle" parameter="notifications_console" /> - </menu_item_check> + </menu_item_call> <menu_item_check label="Texture Size Console" layout="topleft" @@ -1994,19 +1991,6 @@ function="Advanced.ToggleConsole" parameter="memory view" /> </menu_item_check> - <menu_item_check - label="Notifications Console" - layout="topleft" - name="Notifications" - shortcut="control|shift|5" - use_mac_ctrl="true"> - <menu_item_check.on_check - function="Advanced.CheckConsole" - parameter="notifications" /> - <menu_item_check.on_click - function="Floater.Show" - parameter="notifications_console" /> - </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_call @@ -2558,10 +2542,10 @@ name="Texture Atlas"> <menu_item_check.on_check function="CheckControl" - parameter="TextureAtlas" /> + parameter="EnableTextureAtlas" /> <menu_item_check.on_click function="ToggleControl" - parameter="TextureAtlas" /> + parameter="EnableTextureAtlas" /> </menu_item_check> <menu_item_check label="Render Attached Lights" |