summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimcontainer.cpp
diff options
context:
space:
mode:
authormberezhnoy <mberezhnoy@productengine.com>2013-01-18 00:05:51 +0200
committermberezhnoy <mberezhnoy@productengine.com>2013-01-18 00:05:51 +0200
commit6a134c92d82746a2bfbf011e53aa04bdec67655f (patch)
tree419a0e0176adcf6c297be53fee91c065aa2adfad /indra/newview/llfloaterimcontainer.cpp
parentfd0cae39f38673d69448e90971e2369e0b81c2fe (diff)
CHUI-661 User cannot select multiple p2p conversation names in list to start conference chat
Diffstat (limited to 'indra/newview/llfloaterimcontainer.cpp')
-rw-r--r--indra/newview/llfloaterimcontainer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 8264a90325..ac5ecc4b80 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1290,9 +1290,9 @@ BOOL LLFloaterIMContainer::selectConversationPair(const LLUUID& session_id, bool
{
BOOL handled = TRUE;
LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::findConversation(session_id);
-
+
/* widget processing */
- if (select_widget)
+ if (select_widget && mConversationsRoot->getSelectedCount() <= 1)
{
LLFolderViewItem* widget = get_ptr_in_map(mConversationsWidgets,session_id);
if (widget && widget->getParentFolder())