livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for storm-1820

meow-7.2.2
Oz Linden 2012-05-01 13:27:34 -04:00
parent 0248aa5ec2 4c8c3dbc26
commit 790dfda434
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -621,6 +621,7 @@ Jonathan Yap
STORM-1799
STORM-1796
STORM-1807
STORM-1820
STORM-1839
STORM-1842
STORM-1808

11
indra/newview/llviewermenu.cpp
View File

@ -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");

6
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -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"