Commits

Scott Lawrence  committed d91b6b3 Merge

merge changes for storm-1820

  • Participants
  • Parent commits 61f3b32, 7e5d138

Comments (0)

Files changed (3)

File doc/contributions.txt

 	STORM-1799
 	STORM-1796
 	STORM-1807
+	STORM-1820
 	STORM-1839
 	STORM-1842
 	STORM-1808

File indra/newview/llviewermenu.cpp

 // }
 //
 
+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
 {
 
 	// 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");

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

               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"