diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-04 17:07:27 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-04 17:07:27 -0400 |
| commit | 13ca132037e4b8c5b954e0cfe44a9713709bf041 (patch) | |
| tree | 7b90c75957f31f5a149a39b0758ca51545f5a4b3 /indra/newview/llviewermenu.cpp | |
| parent | e2eafb565f95e818b842e4bad94d323f0b4da86b (diff) | |
| parent | 503d394fb57c9043114dfe28ef2836f799142747 (diff) | |
merge changes for DRTVWR-157
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 34e916fec0..c9af6a2820 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -5367,6 +5367,14 @@ void toggle_debug_menus(void*) // } // +class LLCommunicateBlockList : public view_listener_t +{ + bool handleEvent(const LLSD& userdata) + { + LLFloaterSidePanelContainer::showPanel("people", "panel_block_list_sidetray", LLSD()); + return true; + } +}; class LLWorldSetHomeLocation : public view_listener_t { @@ -8152,6 +8160,9 @@ void initialize_menus() // Me > Movement view_listener_t::addMenu(new LLAdvancedAgentFlyingInfo(), "Agent.getFlying"); + + // Communicate + view_listener_t::addMenu(new LLCommunicateBlockList(), "Communicate.BlockList"); // World menu view_listener_t::addMenu(new LLWorldAlwaysRun(), "World.AlwaysRun"); |