diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-18 17:41:01 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-18 17:41:01 +0200 |
| commit | 5dfc8d4c84d2f3d14b08988f2af4e5b14fc47a72 (patch) | |
| tree | 3d757eca2107a93db7ad6d87b9b5068d90d566d9 /indra/newview/llcallfloater.cpp | |
| parent | f7fadaa807a0652df1da41ac69ab069273605965 (diff) | |
| parent | a09c2ba7ac798386b462745774d01c75102beaaf (diff) | |
merge
--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 f60f1e59d7..20739d2401 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -280,10 +280,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")); } |