From b8351e83e8a0354de743c5a4adbc52930b563a76 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Mon, 11 Jul 2011 17:51:16 -0600
Subject: fix for SH-2051: viewer crashes when try to disbable "Show Upload
 Cost"

---
 indra/newview/app_settings/settings.xml            | 11 +++++++++++
 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
-- 
cgit v1.2.3