diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-07-11 17:51:16 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-07-11 17:51:16 -0600 |
| commit | b8351e83e8a0354de743c5a4adbc52930b563a76 (patch) | |
| tree | d5e902403fa69a22d93172bd10e78a10d675bdba /indra/newview | |
| parent | 4b3ed516fc621e8f5300a33c99c74160f05913ef (diff) | |
fix for SH-2051: viewer crashes when try to disbable "Show Upload Cost"
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 12 |
2 files changed, 18 insertions, 5 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index b57657540c..6ddcec6232 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1968,6 +1968,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>DebugShowUploadCost</key> + <map> + <key>Comment</key> + <string>Show mesh upload cost</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>DebugShowXUINames</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 499cf47b6c..0fe6c09684 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2076,12 +2076,14 @@ </menu_item_check> <menu_item_check label="Show Upload Cost" - layout="topleft" name="Show Upload Cost"> - <menu_item_check.on_click - function="ToggleControl" + <menu_item_check.on_check + function="CheckControl" parameter="DebugShowUploadCost" /> - </menu_item_check> + <menu_item_check.on_click + function="ToggleControl" + parameter="DebugShowUploadCost" /> + </menu_item_check> <menu_item_check label="Show Render Info" name="Show Render Info"> @@ -2092,7 +2094,7 @@ function="ToggleControl" parameter="DebugShowRenderInfo" /> </menu_item_check> - <menu_item_check + <menu_item_check label="Show Texture Info" name="Show Texture Info"> <menu_item_check.on_check |