From 0568fb00ab1bc6ddaed5fdd7cac88e81aa8c26e2 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Tue, 15 May 2012 19:31:55 +0300
Subject: CHUI-102 WIP Implemented new context menu for ad-hoc and group
 conferences

---
 indra/newview/llparticipantlist.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'indra/newview/llparticipantlist.cpp')

diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp
index 975a6c67d8..59d26edff2 100644
--- a/indra/newview/llparticipantlist.cpp
+++ b/indra/newview/llparticipantlist.cpp
@@ -32,6 +32,7 @@
 #include "llagent.h"
 
 #include "llimview.h"
+#include "llpanelpeoplemenus.h"
 #include "llnotificationsutil.h"
 #include "llparticipantlist.h"
 #include "llspeakers.h"
@@ -197,10 +198,10 @@ private:
 	uuid_set_t mAvalineCallers;
 };
 
-LLParticipantList::LLParticipantList(LLSpeakerMgr* data_source, 
+LLParticipantList::LLParticipantList(LLSpeakerMgr* data_source,
 									 LLAvatarList* avatar_list,
 									 bool use_context_menu/* = true*/,
-									 bool exclude_agent /*= true*/, 
+									 bool exclude_agent /*= true*/,
 									 bool can_toggle_icons /*= true*/) :
 	mSpeakerMgr(data_source),
 	mAvatarList(avatar_list),
@@ -233,8 +234,9 @@ LLParticipantList::LLParticipantList(LLSpeakerMgr* data_source,
 
 	if (use_context_menu)
 	{
-		mParticipantListMenu = new LLParticipantListMenu(*this);
-		mAvatarList->setContextMenu(mParticipantListMenu);
+		//mParticipantListMenu = new LLParticipantListMenu(*this);
+		//mAvatarList->setContextMenu(mParticipantListMenu);
+		mAvatarList->setContextMenu(&LLPanelPeopleMenus::gNearbyMenu);
 	}
 	else
 	{
@@ -670,7 +672,7 @@ bool LLParticipantList::SpeakerMuteListener::handleEvent(LLPointer<LLOldEvents::
 	return mParent.onSpeakerMuteEvent(event, userdata);
 }
 
-LLContextMenu* LLParticipantList::LLParticipantListMenu::createMenu()
+/*LLContextMenu* LLParticipantList::LLParticipantListMenu::createMenu()
 {
 	// set up the callbacks for all of the avatar menu items
 	LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
@@ -708,7 +710,7 @@ LLContextMenu* LLParticipantList::LLParticipantListMenu::createMenu()
 	main_menu->arrangeAndClear();
 
 	return main_menu;
-}
+}*/
 
 void LLParticipantList::LLParticipantListMenu::show(LLView* spawning_view, const uuid_vec_t& uuids, S32 x, S32 y)
 {
-- 
cgit v1.2.3