diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2012-06-08 01:08:58 +0300 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2012-06-08 01:08:58 +0300 |
| commit | 9b92235291382deac15b860efa281f625d2173dd (patch) | |
| tree | eec4900a7ea58dfba6b7e4ade12ac1508ebf17e9 /indra/newview/llimconversation.cpp | |
| parent | 8353a1ab4d9dab891535b766329c5d92323fe3b6 (diff) | |
CHUI-120 WIP Added conversations participants drag and drop from avatar lists to IM floaters.
- Added new drag and drop type DAD_PERSON and source SOURCE_PEOPLE to avoid highliting the toolbars when using SOURCE_VIEWER.
- Disabled calling card drop support as it is considered obsolete.
Diffstat (limited to 'indra/newview/llimconversation.cpp')
| -rw-r--r-- | indra/newview/llimconversation.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp index d8c7c63e9e..ec2a9196d4 100644 --- a/indra/newview/llimconversation.cpp +++ b/indra/newview/llimconversation.cpp @@ -83,8 +83,10 @@ BOOL LLIMConversation::postBuild() mExpandCollapseBtn->setClickedCallback(boost::bind(&LLIMConversation::onSlide, this)); mParticipantListPanel = getChild<LLLayoutPanel>("speakers_list_panel"); - mParticipantListPanel->setVisible( - mIsNearbyChat? false : gSavedSettings.getBOOL("IMShowControlPanel")); + + // Show the participants list in torn off floaters only. + mParticipantListPanel->setVisible(gSavedSettings.getBOOL("IMShowControlPanel") + && !mIsNearbyChat); // *TODO: temporarily disabled for Nearby chat mExpandCollapseBtn->setImageOverlay( getString(mParticipantListPanel->getVisible() ? "collapse_icon" : "expand_icon")); mExpandCollapseBtn->setEnabled(!mIsP2PChat); @@ -209,12 +211,10 @@ void LLIMConversation::updateHeaderAndToolbar() } bool is_control_panel_visible = false; - if (!mIsP2PChat) - { // Control panel should be visible only in torn off floaters. is_control_panel_visible = !is_hosted && gSavedSettings.getBOOL("IMShowControlPanel"); - mParticipantListPanel->setVisible(is_control_panel_visible); - } + mParticipantListPanel->setVisible(!mIsP2PChat && is_control_panel_visible + && !mIsNearbyChat); // *TODO: temporarily disabled for Nearby chat // Display collapse image (<<) if the floater is hosted // or if it is torn off but has an open control panel. |