diff options
| author | Mike Antipov <mantipov@productengine.com> | 2009-11-27 14:50:11 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2009-11-27 14:50:11 +0200 |
| commit | 90e85022eb7c0f1f2de88636ad8a53dc7fba41d2 (patch) | |
| tree | c106092d3fc0a3c53c890d764e7fe795ce15205f | |
| parent | e88219b5e363f9535ac1193b2041da35ba5dd702 (diff) | |
Work on major sub-task EXT-2790 (Complete Voice Control Panel (floater) started by Lynx (LLVoiceControlPanel))
-- fixed bug with setting context menu for participant list
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llparticipantlist.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 17d59f86bb..c8d50ceb10 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -128,7 +128,7 @@ void LLCallFloater::refreshPartisipantList() delete mPaticipants; mAvatarList->clear(); - bool is_local_chat_session = LLLocalSpeakerMgr::getInstance() == mSpeakerManager; - mPaticipants = new LLParticipantList(mSpeakerManager, mAvatarList, is_local_chat_session); + bool do_not_use_context_menu_in_local_chat = LLLocalSpeakerMgr::getInstance() != mSpeakerManager; + mPaticipants = new LLParticipantList(mSpeakerManager, mAvatarList, do_not_use_context_menu_in_local_chat); } //EOF diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index 7cf5302e40..68dc1b511f 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -74,6 +74,10 @@ LLParticipantList::LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* av mParticipantListMenu = new LLParticipantListMenu(*this); mAvatarList->setContextMenu(mParticipantListMenu); } + else + { + mAvatarList->setContextMenu(NULL); + } //Lets fill avatarList with existing speakers LLAvatarList::uuid_vector_t& group_members = mAvatarList->getIDs(); |