diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-02-11 15:26:17 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-02-11 15:26:17 +0200 |
| commit | 5066e850df6e44e65bf7760ac990fdd5ed1c7b8e (patch) | |
| tree | bf9803d9d271a26e06e676f29aebf0dac69d6412 /indra | |
| parent | 4b4367269058c8ba10d284b48ffae9e24fd086ce (diff) | |
CHUI-728 FIXED Don't display Nearby chat participants if Conversation pane is collapsed.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 05db0e93e6..cef45a5b56 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -1769,7 +1769,7 @@ void LLFloaterIMContainer::openNearbyChat() { // If there's only one conversation in the container and that conversation is the nearby chat //(which it should be...), open it so to make the list of participants visible. This happens to be the most common case when opening the Chat floater. - if(mConversationsItems.size() == 1) + if((mConversationsItems.size() == 1)&&(!mConversationsPane->isCollapsed())) { LLConversationViewSession* nearby_chat = dynamic_cast<LLConversationViewSession*>(get_ptr_in_map(mConversationsWidgets,LLUUID())); if (nearby_chat) |