summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexanderP ProductEngine <apaschenko@productengine.com>2012-06-28 17:22:00 +0300
committerAlexanderP ProductEngine <apaschenko@productengine.com>2012-06-28 17:22:00 +0300
commitcd7d499ea779178d49be65d37e852712f82c3c90 (patch)
tree0597b33fad16b19b49799ca18dfe8674dff02642
parent5eab95955fec4d3dcb8b2f98c6c084d227e70b8c (diff)
CHUI-168 FIXED, CHUI-183 FIXED Supress of a resizable and dragging and hide a title for the docked floater
-rw-r--r--indra/newview/llimconversation.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp
index dc68c5cea1..acdd7ba46a 100644
--- a/indra/newview/llimconversation.cpp
+++ b/indra/newview/llimconversation.cpp
@@ -250,14 +250,16 @@ void LLIMConversation::updateHeaderAndToolbar()
bool is_expanded = is_hosted || is_participant_list_visible;
mExpandCollapseBtn->setImageOverlay(getString(is_expanded ? "collapse_icon" : "expand_icon"));
- // The button (>>) should be disabled for torn off P2P conversations.
- mExpandCollapseBtn->setEnabled(is_hosted || !mIsP2PChat);
-
+ // toggle floater's drag handle and title visibility
if (mDragHandle)
{
- // toggle floater's drag handle and title visibility
- mDragHandle->setVisible(!is_hosted);
+ mDragHandle->setTitleVisible(!is_hosted);
+ setCanDrag(!is_hosted);
}
+ setCanResize(!is_hosted);
+
+ // The button (>>) should be disabled for torn off P2P conversations.
+ mExpandCollapseBtn->setEnabled(is_hosted || !mIsP2PChat);
mTearOffBtn->setImageOverlay(getString(is_hosted ? "tear_off_icon" : "return_icon"));
@@ -347,6 +349,8 @@ void LLIMConversation::onOpen(const LLSD& key)
host_floater->collapseMessagesPane(false);
}
+ setCanResize(TRUE);
+
updateHeaderAndToolbar();
}