diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-01 13:27:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-01 13:27:34 -0400 |
| commit | 790dfda43472da75d17a848eb91e2dcecb2b96e7 (patch) | |
| tree | 60ded86e4dae06bbfe1f0593d6565c7eb58c59a3 | |
| parent | 0248aa5ec26897cfbb631e87ea1044848ce196b6 (diff) | |
| parent | 4c8c3dbc2631ffda1d26bb56de0a75779f3bc215 (diff) | |
merge changes for storm-1820
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 11 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 6 |
3 files changed, 18 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 3054c5ce14..0e8d70e445 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -621,6 +621,7 @@ Jonathan Yap STORM-1799 STORM-1796 STORM-1807 + STORM-1820 STORM-1839 STORM-1842 STORM-1808 diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 12aed8f448..22dba82014 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -5256,6 +5256,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 { @@ -8034,6 +8042,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"); diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 1d11abcf73..fcca0172f0 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -291,6 +291,12 @@ function="SideTray.PanelPeopleTab" parameter="nearby_panel" /> </menu_item_call> + <menu_item_call + label="Block List" + name="Block List"> + <menu_item_call.on_click + function="Communicate.BlockList" /> + </menu_item_call> </menu> <menu create_jump_keys="true" |