diff options
| author | Eugene Mutavchi <emutavchi@productengine.com> | 2009-12-18 17:15:54 +0200 |
|---|---|---|
| committer | Eugene Mutavchi <emutavchi@productengine.com> | 2009-12-18 17:15:54 +0200 |
| commit | a09c2ba7ac798386b462745774d01c75102beaaf (patch) | |
| tree | 247997bc937b9e77b98d3c1aba4f05049fb1238d /indra/newview/llcallfloater.cpp | |
| parent | caab41523da6ca89e6478154184d874cfcb19d79 (diff) | |
Major task EXT-3466 (Add avatars context menu for nearby voice chat in the voice control panel)
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 1f23840109..b1e530d323 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -270,10 +270,9 @@ void LLCallFloater::refreshPartisipantList() if (!non_avatar_caller) { - 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); + mPaticipants = new LLParticipantList(mSpeakerManager, mAvatarList); - if (!do_not_use_context_menu_in_local_chat) + if (LLLocalSpeakerMgr::getInstance() == mSpeakerManager) { mAvatarList->setNoItemsCommentText(getString("no_one_near")); } |