aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-06-23 20:47:21 -0700
committerMcCabe Maxsted2011-06-23 20:47:21 -0700
commitc96afda71bd39e69e1b26849ac5e956d0fd97072 (patch)
tree96ae96e4f54e3951759b856bacdd09e740118f5f /linden/indra/newview/llviewermenu.cpp
parentUpdated Imp's easter egg chat commands with the new website urls (diff)
downloadmeta-impy-c96afda71bd39e69e1b26849ac5e956d0fd97072.zip
meta-impy-c96afda71bd39e69e1b26849ac5e956d0fd97072.tar.gz
meta-impy-c96afda71bd39e69e1b26849ac5e956d0fd97072.tar.bz2
meta-impy-c96afda71bd39e69e1b26849ac5e956d0fd97072.tar.xz
Created new window for inworld dice rolling in advanced > UI. Todo: add button for 'rocks fall, everybody dies'
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
-rw-r--r--linden/indra/newview/llviewermenu.cpp29
1 files changed, 29 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index c336c3a..a83c11b 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -84,6 +84,7 @@
84#include "llfirstuse.h" 84#include "llfirstuse.h"
85#include "llfloater.h" 85#include "llfloater.h"
86#include "floaterao.h" 86#include "floaterao.h"
87#include "floaterdice.h"
87#include "llfloaterabout.h" 88#include "llfloaterabout.h"
88#include "llfloaterbuycurrency.h" 89#include "llfloaterbuycurrency.h"
89#include "llfloateractivespeakers.h" 90#include "llfloateractivespeakers.h"
@@ -9601,6 +9602,32 @@ class LLAdvancedReloadBalance : public view_listener_t
9601 } 9602 }
9602}; 9603};
9603 9604
9605
9606/////////////////
9607// DICE WINDOW //
9608/////////////////
9609
9610
9611class LLAdvancedToggleDice : public view_listener_t
9612{
9613 bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
9614 {
9615 FloaterDice::toggleInstance();
9616 return true;
9617 }
9618};
9619
9620class LLAdvancedCheckDice : public view_listener_t
9621{
9622 bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
9623 {
9624 bool new_value = FloaterDice::instanceVisible();
9625 std::string control_name = userdata["control"].asString();
9626 gMenuHolder->findControl(control_name)->setValue(new_value);
9627 return true;
9628 }
9629};
9630
9604///////////////////// 9631/////////////////////
9605// DUMP SELECT MGR // 9632// DUMP SELECT MGR //
9606///////////////////// 9633/////////////////////
@@ -11421,6 +11448,8 @@ void initialize_menus()
11421 addMenu(new LLAdvancedWebBrowserTest(), "Advanced.WebBrowserTest"); 11448 addMenu(new LLAdvancedWebBrowserTest(), "Advanced.WebBrowserTest");
11422 addMenu(new LLAdvancedToggleEditableUI(), "Advanced.ToggleEditableUI"); 11449 addMenu(new LLAdvancedToggleEditableUI(), "Advanced.ToggleEditableUI");
11423 addMenu(new LLAdvancedReloadBalance(), "Advanced.ReloadBalance"); 11450 addMenu(new LLAdvancedReloadBalance(), "Advanced.ReloadBalance");
11451 addMenu(new LLAdvancedToggleDice(), "Advanced.ToggleDice");
11452 addMenu(new LLAdvancedCheckDice(), "Advanced.CheckDice");
11424 //addMenu(new LLAdvancedCheckEditableUI(), "Advanced.CheckEditableUI"); 11453 //addMenu(new LLAdvancedCheckEditableUI(), "Advanced.CheckEditableUI");
11425 addMenu(new LLAdvancedDumpSelectMgr(), "Advanced.DumpSelectMgr"); 11454 addMenu(new LLAdvancedDumpSelectMgr(), "Advanced.DumpSelectMgr");
11426 addMenu(new LLAdvancedDumpInventory(), "Advanced.DumpInventory"); 11455 addMenu(new LLAdvancedDumpInventory(), "Advanced.DumpInventory");