From 98ce08c8fd272e0956759de857d65e6d50922677 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 30 Mar 2012 18:06:21 -0400
Subject: STORM-1820 Discoverability of the menu that opens the Block List is
difficult
---
doc/contributions.txt | 1 +
indra/newview/llviewermenu.cpp | 14 ++++++++++++++
indra/newview/skins/default/xui/en/menu_viewer.xml | 6 ++++++
3 files changed, 21 insertions(+)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index c5db396c97..71f1efccf6 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -610,6 +610,7 @@ Jonathan Yap
STORM-1788
STORM-1799
STORM-1796
+ STORM-1820
Kadah Coba
STORM-1060
Jondan Lundquist
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 99540ccce9..138ba11f95 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -5256,6 +5256,17 @@ void toggle_debug_menus(void*)
// }
//
+class LLCommunicateBlockList : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ // we just send the message and let the server check for failure cases
+ // server will echo back a "Home position set." alert if it succeeds
+ // and the home location screencapture happens when that alert is recieved
+ LLFloaterSidePanelContainer::showPanel("people", "panel_block_list_sidetray", LLSD());
+ return true;
+ }
+};
class LLWorldSetHomeLocation : public view_listener_t
{
@@ -8040,6 +8051,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"
--
cgit v1.2.3
From 4c8c3dbc2631ffda1d26bb56de0a75779f3bc215 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 30 Mar 2012 18:11:28 -0400
Subject: STORM-1820 Remove incorrect comment
---
indra/newview/llviewermenu.cpp | 3 ---
1 file changed, 3 deletions(-)
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 138ba11f95..e3cb1ebe10 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -5260,9 +5260,6 @@ class LLCommunicateBlockList : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
- // we just send the message and let the server check for failure cases
- // server will echo back a "Home position set." alert if it succeeds
- // and the home location screencapture happens when that alert is recieved
LLFloaterSidePanelContainer::showPanel("people", "panel_block_list_sidetray", LLSD());
return true;
}
--
cgit v1.2.3