From 378190d67f1ee4b157a9495983efbfacd1c98fbc Mon Sep 17 00:00:00 2001
From: Tom Grimshaw
Date: Mon, 24 May 2010 20:20:55 +0100
Subject: Make "Show Look At" a persistent setting (Ported from Emerald, full
 credit due there.)

---
 linden/indra/newview/app_settings/settings.xml               | 11 +++++++++++
 linden/indra/newview/llhudeffectlookat.cpp                   |  2 ++
 linden/indra/newview/llviewermenu.cpp                        |  2 +-
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml |  6 ++----
 4 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 3b5fa3f..7c9b7d7 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -12996,5 +12996,16 @@
       <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>
   </map>
 </llsd>
diff --git a/linden/indra/newview/llhudeffectlookat.cpp b/linden/indra/newview/llhudeffectlookat.cpp
index b18fc62..00bff21 100644
--- a/linden/indra/newview/llhudeffectlookat.cpp
+++ b/linden/indra/newview/llhudeffectlookat.cpp
@@ -553,6 +553,8 @@ 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 3adab3c..4acc71c 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1380,7 +1380,7 @@ void init_debug_avatar_menu(LLMenuGL* menu)
 	menu->append(new LLMenuItemCallGL("Reload Vertex Shader", &reload_vertex_shader, NULL));
 	menu->append(new LLMenuItemToggleGL("Animation Info", &LLVOAvatar::sShowAnimationDebug));
 	menu->append(new LLMenuItemCallGL("Slow Motion Animations", &slow_mo_animations, NULL));
-	menu->append(new LLMenuItemToggleGL("Show Look At", &LLHUDEffectLookAt::sDebugLookAt));
+	menu->append(new LLMenuItemCheckGL( "Show Look At",	&menu_toggle_control, NULL, &menu_check_control, (void*)"PersistShowLookAt"));
 	menu->append(new LLMenuItemToggleGL("Show Point At", &LLHUDEffectPointAt::sDebugPointAt));
 	menu->append(new LLMenuItemToggleGL("Debug Joint Updates", &LLVOAvatar::sJointDebug));
 	menu->append(new LLMenuItemToggleGL("Disable LOD", &LLViewerJoint::sDisableLOD));
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 d5d21fb..919f888 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,10 +1861,8 @@
 
       <menu_item_check name="Show Look At"
                        label="Show Look At">
-        <on_click function="Advanced.ToggleShowLookAt"
-                  userdata="" />
-        <on_check function="Advanced.CheckShowLookAt"
-                  userdata="" />
+        <on_click function="ToggleControl" userdata="PersistShowLookAt" />
+        <on_check control="PersistShowLookAt" />
       </menu_item_check>
       <menu_item_check name="Show Point At"
                        label="Show Point At">
-- 
cgit v1.1