diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-06-05 19:27:48 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-06-05 19:27:48 +0300 |
| commit | 58d2896a0717f993c8848f6b5bf08f650ec9f272 (patch) | |
| tree | 313f12332476a7ed2b2010846cf417eb10804227 /indra/newview | |
| parent | d5d8fd674ec6c81021e2921f71d7b98a45b2db84 (diff) | |
CHUI-918 Don't show "Close Selected" item if Nearby chat is selected
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llconversationmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp index 27caedf472..192a594c9d 100755 --- a/indra/newview/llconversationmodel.cpp +++ b/indra/newview/llconversationmodel.cpp @@ -363,7 +363,7 @@ void LLConversationItemSession::buildContextMenu(LLMenuGL& menu, U32 flags) lldebugs << "LLConversationItemParticipant::buildContextMenu()" << llendl; menuentry_vec_t items; menuentry_vec_t disabled_items; - if(flags & ITEM_IN_MULTI_SELECTION) + if((flags & ITEM_IN_MULTI_SELECTION) && (this->getType() != CONV_SESSION_NEARBY)) { items.push_back(std::string("close_selected_conversations")); } |