From b423ea58ca2fe4f9be36fa7b3e70017bc7e8368d Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Tue, 10 Nov 2009 01:04:52 +0800
Subject: [PATCH] fix xml function param problem and adding missing settings in
settings.xml
---
indra/newview/app_settings/settings.xml | 11 ++++++++
.../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 6f6d5fb9796..55ff255c38e 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 66c9060b06d..dbc9601680c 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"
--
GitLab