aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-06 18:33:23 -0700
committerMcCabe Maxsted2009-09-06 18:33:23 -0700
commit5ef87f0115db707483699af0a468945f022fcfc6 (patch)
tree3c2d501ed3ee51eab5dfa161ca93da911362c529 /linden/indra/newview/llviewermenu.cpp
parentfix NDOF linking issues when using cmake 2.6 on linux (diff)
downloadmeta-impy-5ef87f0115db707483699af0a468945f022fcfc6.zip
meta-impy-5ef87f0115db707483699af0a468945f022fcfc6.tar.gz
meta-impy-5ef87f0115db707483699af0a468945f022fcfc6.tar.bz2
meta-impy-5ef87f0115db707483699af0a468945f022fcfc6.tar.xz
Ported sit anywhere feature from Emerald viewer
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
-rw-r--r--linden/indra/newview/llviewermenu.cpp28
1 files changed, 28 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 51953b09..727f357 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -7556,6 +7556,32 @@ class LLAdvancedCheckHUDInfo : public view_listener_t
7556}; 7556};
7557 7557
7558 7558
7559//////////////////////
7560// FORCE GROUND SIT //
7561//////////////////////
7562
7563class LLAdvancedToggleSit: public view_listener_t
7564{
7565 bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
7566 {
7567 LLChat chat;
7568 chat.mSourceType = CHAT_SOURCE_SYSTEM;
7569 if(!gAgent.getAvatarObject()->mIsSitting)
7570 {
7571 gAgent.setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
7572 chat.mText = "Forcing Ground Sit";
7573 }
7574 else
7575 {
7576 gAgent.setControlFlags(!AGENT_CONTROL_SIT_ON_GROUND);
7577 gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
7578 chat.mText = "Standing up";
7579 }
7580 LLFloaterChat::addChat(chat);
7581 return true;
7582 }
7583};
7584
7559 7585
7560/////////////////////// 7586///////////////////////
7561// CLEAR GROUP CACHE // 7587// CLEAR GROUP CACHE //
@@ -9572,6 +9598,7 @@ void initialize_menus()
9572 addMenu(new LLWorldTeleportHome(), "World.TeleportHome"); 9598 addMenu(new LLWorldTeleportHome(), "World.TeleportHome");
9573 addMenu(new LLWorldSetAway(), "World.SetAway"); 9599 addMenu(new LLWorldSetAway(), "World.SetAway");
9574 addMenu(new LLWorldSetBusy(), "World.SetBusy"); 9600 addMenu(new LLWorldSetBusy(), "World.SetBusy");
9601 addMenu(new LLAdvancedToggleSit(), "Advanced.ToggleSit");
9575 9602
9576 addMenu(new LLWorldEnableCreateLandmark(), "World.EnableCreateLandmark"); 9603 addMenu(new LLWorldEnableCreateLandmark(), "World.EnableCreateLandmark");
9577 addMenu(new LLWorldEnableSetHomeLocation(), "World.EnableSetHomeLocation"); 9604 addMenu(new LLWorldEnableSetHomeLocation(), "World.EnableSetHomeLocation");
@@ -9720,6 +9747,7 @@ void initialize_menus()
9720 addMenu(new LLAdvancedCheckConsole(), "Advanced.CheckConsole"); 9747 addMenu(new LLAdvancedCheckConsole(), "Advanced.CheckConsole");
9721 addMenu(new LLAdvancedDumpInfoToConsole(), "Advanced.DumpInfoToConsole"); 9748 addMenu(new LLAdvancedDumpInfoToConsole(), "Advanced.DumpInfoToConsole");
9722 addMenu(new LLAdvancedReloadSettingsOverrides(), "Advanced.ReloadSettingsOverrides"); 9749 addMenu(new LLAdvancedReloadSettingsOverrides(), "Advanced.ReloadSettingsOverrides");
9750 addMenu(new LLAdvancedToggleSit(), "Advanced.ToggleSit");
9723 9751
9724 // Advanced > HUD Info 9752 // Advanced > HUD Info
9725 addMenu(new LLAdvancedToggleHUDInfo(), "Advanced.ToggleHUDInfo"); 9753 addMenu(new LLAdvancedToggleHUDInfo(), "Advanced.ToggleHUDInfo");