1 files changed, 120 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 2e4f3f4..36ffc21 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -210,6 +210,9 @@
 
 #include "lltexlayer.h"
 
+#include "jcfloater_animation_list.h"
+#include "llfloaterassetbrowser.h"
+
 void init_client_menu(LLMenuGL* menu);
 void init_server_menu(LLMenuGL* menu);
 
@@ -5218,6 +5221,10 @@ class LLShowFloater : public view_listener_t
                 {
                         LLFloaterActiveSpeakers::toggleInstance(LLSD());
                 }
+                else if (floater_name == "animation list")
+                {
+                        JCFloaterAnimList::toggleInstance(LLSD());
+                }
                 else if (floater_name == "inworld browser")
                 {
                         LLFloaterMediaBrowser::toggle();
@@ -7555,6 +7562,113 @@ class LLAdvancedCheckHUDInfo : public view_listener_t
 };
 
 
+//////////////////////
+// FORCE GROUND SIT //
+//////////////////////
+
+class LLAdvancedToggleSit: public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLChat chat;
+                chat.mSourceType = CHAT_SOURCE_SYSTEM;
+                if(!gAgent.getAvatarObject()->mIsSitting)
+                {
+                        gAgent.setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
+                        chat.mText = "Forcing Ground Sit";
+                }
+                else
+                {
+                        gAgent.setControlFlags(!AGENT_CONTROL_SIT_ON_GROUND);
+                        gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
+                        chat.mText = "Standing up";
+                }
+                LLFloaterChat::addChat(chat);
+                return true;
+        }
+};
+
+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 //
+/////////////
+
+class LLAdvancedTogglePhantom: public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLAgent::togglePhantom();
+                BOOL ph = LLAgent::getPhantom();
+                LLChat chat;
+                chat.mSourceType = CHAT_SOURCE_SYSTEM;
+                chat.mText = llformat("%s%s","Phantom ",(ph ? "On" : "Off"));
+                LLFloaterChat::addChat(chat);
+                //gMenuHolder->findControl(userdata["control"].asString())->setValue(ph);
+                return true;
+        }
+
+};
+
+class LLAdvancedCheckPhantom: public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(LLAgent::getPhantom());
+                return true;
+        }
+};
+
+
+///////////////////
+// ASSET BROWSER //
+///////////////////
+
+class LLAdvancedToggleAssetBrowser: public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                //open the floater
+                LLFloaterAssetBrowser::show(0);
+                
+                bool vis = false;
+                if(LLFloaterAssetBrowser::getInstance())
+                {
+                        vis = (bool)LLFloaterAssetBrowser::getInstance()->getVisible();
+                }
+                return true;
+        }
+};
+
+class LLAdvancedCheckAssetBrowser: public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool vis = false;
+                if(LLFloaterAssetBrowser::getInstance())
+                {
+                        vis = (bool)LLFloaterAssetBrowser::getInstance()->getVisible();
+                }
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(vis);
+                return true;
+        }
+};
+
 
 ///////////////////////
 // CLEAR GROUP CACHE //
@@ -9719,6 +9833,12 @@ void initialize_menus()
         addMenu(new LLAdvancedCheckConsole(), "Advanced.CheckConsole");
         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");
+        addMenu(new LLAdvancedCheckAssetBrowser(),"Advanced.CheckAssetBrowser");
 
         // Advanced > HUD Info
         addMenu(new LLAdvancedToggleHUDInfo(), "Advanced.ToggleHUDInfo");