Cleaned up the Emerald showlookat patch

5 files changed, 30 insertions, 26 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index d8051a0..da9cdc6 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -327,6 +327,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>PersistShowLookAt</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether or not to show look at info</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>PrivateLookAtTarget</key>
   <map>
     <key>Comment</key>
@@ -349,6 +360,17 @@
     <key>Value</key>
     <real>0.0</real>
   </map>
+  <key>ShowLookAtNames</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether or not to show names over who looks at you</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>SpeedRez</key>
   <map>
     <key>Comment</key>
@@ -12996,27 +13018,5 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>PersistShowLookAt</key>
-    <map>
-      <key>Comment</key>
-      <string>Whether or not to show look at info</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>ShowLookAtNames</key>
-    <map>
-      <key>Comment</key>
-      <string>Whether or not to show names over who looks at you</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
   </map>
 </llsd>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 22b18ce..44693c2 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -127,6 +127,7 @@
 
 #include "llworld.h"
 #include "llhudeffecttrail.h"
+#include "llhudeffectlookat.h"
 #include "llvectorperfoptions.h"
 #include "llurlsimstring.h"
 #include "llwatchdog.h"
@@ -429,6 +430,8 @@ static void settings_to_globals()
         LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap");
 
         LLSlider::setScrollWheelMultiplier( gSavedSettings.getS32("SliderScrollWheelMultiplier") );
+
+        LLHUDEffectLookAt::sDebugLookAt = gSavedSettings.getBOOL("PersistShowLookAt");
 }
 
 static void settings_modify()
diff --git a/linden/indra/newview/llhudeffectlookat.cpp b/linden/indra/newview/llhudeffectlookat.cpp
index 99328f1..7de5f14 100644
--- a/linden/indra/newview/llhudeffectlookat.cpp
+++ b/linden/indra/newview/llhudeffectlookat.cpp
@@ -587,8 +587,6 @@ void LLHUDEffectLookAt::render()
 //-----------------------------------------------------------------------------
 void LLHUDEffectLookAt::update()
 {
-        LLHUDEffectLookAt::sDebugLookAt = gSavedSettings.getBOOL("PersistShowLookAt");
-
         // If the target object is dead, set the target object to NULL
         if (!mTargetObject.isNull() && mTargetObject->isDead())
         {
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 4acc71c..5172072 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -10072,6 +10072,7 @@ class LLAdvancedToggleShowLookAt : public view_listener_t
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
                 LLHUDEffectLookAt::sDebugLookAt = !(LLHUDEffectLookAt::sDebugLookAt);
+                gSavedSettings.setBOOL("PersistShowLookAt", LLHUDEffectLookAt::sDebugLookAt);
                 return true;
         }
 };
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 919f888..d5d21fb 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1861,8 +1861,10 @@
 
       <menu_item_check name="Show Look At"
                        label="Show Look At">
-        <on_click function="ToggleControl" userdata="PersistShowLookAt" />
-        <on_check control="PersistShowLookAt" />
+        <on_click function="Advanced.ToggleShowLookAt"
+                  userdata="" />
+        <on_check function="Advanced.CheckShowLookAt"
+                  userdata="" />
       </menu_item_check>
       <menu_item_check name="Show Point At"
                        label="Show Point At">