From 056f41c8542e60ea57af83bd18caa01db44a15c5 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 7 Sep 2009 00:43:37 -0700
Subject: Fixed ground sit menu entry missing check

---
 ChangeLog.txt                                           | 10 ++++++++--
 linden/indra/newview/llviewermenu.cpp                   | 17 +++++++++++++++++
 .../newview/skins/default/xui/en-us/menu_viewer.xml     |  1 +
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index ba6afaf..db66bc3 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,12 +1,12 @@
 2009-09-06  McCabe Maxsted  <hakushakukun@gmail.com>
 
-     * Ported sit anywhere feature from Emerald viewer.
+     * Applied sit anywhere feature from Emerald viewer.
 	 
 		modified:   linden/indra/newview/llviewermenu.cpp
 		modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
 		
 		
-     * Ported phantom avatar option from Emerald viewer.
+     * Applied phantom avatar feature from Emerald viewer.
 	 
 		modified:   linden/indra/newview/llagent.cpp
 		modified:   linden/indra/newview/llagent.h
@@ -52,6 +52,12 @@
 		modified:   linden/indra/newview/jcfloater_animation_list.cpp
 		
 		
+     * Fixed ground sit menu entry missing check.
+	 
+		modified:   linden/indra/newview/llviewermenu.cpp
+		modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
 2009-09-04  McCabe Maxsted  <hakushakukun@gmail.com>
 
      * Updated GStreamer and Zlib windows libs.
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 4c91a0a..cfc9a14 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -7589,6 +7589,22 @@ class LLAdvancedToggleSit: public view_listener_t
 	}
 };
 
+class LLAdvancedCheckSit : public view_listener_t
+{
+    bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+    {
+		if(gAgent.getAvatarObject()->mIsSitting)
+		{
+			gMenuHolder->findControl(userdata["control"].asString())->setValue(true);
+		}
+		else
+		{
+			gMenuHolder->findControl(userdata["control"].asString())->setValue(false);
+		}
+		return true;
+	}
+};
+
 
 /////////////
 // PHANTOM //
@@ -9819,6 +9835,7 @@ void initialize_menus()
 	addMenu(new LLAdvancedDumpInfoToConsole(), "Advanced.DumpInfoToConsole");
 	addMenu(new LLAdvancedReloadSettingsOverrides(), "Advanced.ReloadSettingsOverrides");
 	addMenu(new LLAdvancedToggleSit(), "Advanced.ToggleSit");
+	addMenu(new LLAdvancedCheckSit(), "Emerald.CheckSit");
 	addMenu(new LLAdvancedTogglePhantom(), "Advanced.TogglePhantom");
 	addMenu(new LLAdvancedCheckPhantom(), "Advanced.CheckPhantom");
 	addMenu(new LLAdvancedToggleAssetBrowser(),"Advanced.ToggleAssetBrowser");
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 5407061..a53e339 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
@@ -887,6 +887,7 @@
     <menu_item_call label="Ground Sit" name="Ground Sit" 
                     shortcut="control|alt|s">
       <on_click function="Advanced.ToggleSit" userdata="" />
+      <on_Check function="Advanced.CheckSit" userdata="" />
     </menu_item_call>
     <menu_item_check label="Phantom Avatar" name="Phantom" 
                      shortcut="control|alt|p">
-- 
cgit v1.1