diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-08-15 20:10:00 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-08-15 20:10:00 +0300 |
| commit | 3a21eb59f1cf0b7672e2beb671e1dbc717e28b3f (patch) | |
| tree | cba0242f33dad84ff8775c538b90e2eac9a357b7 /indra/newview/llimconversation.cpp | |
| parent | c234ef4b3a1ab22132512958c324e5f796912144 (diff) | |
CHUI-286 (Conversations floater opened by default when a new IM session is started (no IM toast shown): now floater silently adds itself to the container
Diffstat (limited to 'indra/newview/llimconversation.cpp')
| -rw-r--r-- | indra/newview/llimconversation.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp index ec25583c8f..4ca9476458 100644 --- a/indra/newview/llimconversation.cpp +++ b/indra/newview/llimconversation.cpp @@ -153,6 +153,7 @@ void LLIMConversation::draw() } refresh(); + updateHeaderAndToolbar(); // Restart the refresh timer mRefreshTimer->setTimerExpirySec(REFRESH_INTERVAL); @@ -265,7 +266,7 @@ void LLIMConversation::hideAllStandardButtons() void LLIMConversation::updateHeaderAndToolbar() { - bool is_torn_off = isTornOff(); + bool is_torn_off = !getHost(); if (!is_torn_off) { hideAllStandardButtons(); |