Skip to content
Snippets Groups Projects
Commit 7698e169 authored by Mnikolenko ProductEngine's avatar Mnikolenko ProductEngine
Browse files

MAINT-3186 FIXED Disable menu items if group or ad-hoc chat is in multiselection

parent 6bbb8681
No related branches found
No related tags found
No related merge requests found
...@@ -1271,6 +1271,22 @@ bool LLFloaterIMContainer::enableContextMenuItem(const LLSD& userdata) ...@@ -1271,6 +1271,22 @@ bool LLFloaterIMContainer::enableContextMenuItem(const LLSD& userdata)
uuid_vec_t uuids; uuid_vec_t uuids;
getParticipantUUIDs(uuids); getParticipantUUIDs(uuids);
//If there is group or ad-hoc chat in multiselection, everything needs to be disabled
if(uuids.size() > 1)
{
const std::set<LLFolderViewItem*> selectedItems = mConversationsRoot->getSelectionList();
LLConversationItem * conversationItem;
for(std::set<LLFolderViewItem*>::const_iterator it = selectedItems.begin(); it != selectedItems.end(); ++it)
{
conversationItem = static_cast<LLConversationItem *>((*it)->getViewModelItem());
if((conversationItem->getType() == LLConversationItem::CONV_SESSION_GROUP) || (conversationItem->getType() == LLConversationItem::CONV_SESSION_AD_HOC))
{
return false;
}
}
}
if ("conversation_log" == item) if ("conversation_log" == item)
{ {
return gSavedPerAccountSettings.getS32("KeepConversationLogTranscripts") > 0; return gSavedPerAccountSettings.getS32("KeepConversationLogTranscripts") > 0;
...@@ -1375,6 +1391,10 @@ bool LLFloaterIMContainer::enableContextMenuItem(const std::string& item, uuid_v ...@@ -1375,6 +1391,10 @@ bool LLFloaterIMContainer::enableContextMenuItem(const std::string& item, uuid_v
else if ("can_call" == item) else if ("can_call" == item)
{ {
return LLAvatarActions::canCall(); return LLAvatarActions::canCall();
}
else if ("can_open_voice_conversation" == item)
{
return is_single_select && LLAvatarActions::canCall();
} }
else if ("can_zoom_in" == item) else if ("can_zoom_in" == item)
{ {
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
layout="topleft" layout="topleft"
name="open_voice_conversation"> name="open_voice_conversation">
<on_click function="Avatar.DoToSelected" parameter="open_voice_conversation"/> <on_click function="Avatar.DoToSelected" parameter="open_voice_conversation"/>
<on_enable function="Avatar.EnableItem" parameter="can_open_voice_conversation"/>
</menu_item_call> </menu_item_call>
<menu_item_call <menu_item_call
label="Disconnect from voice" label="Disconnect from voice"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment