diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-03-22 20:28:52 -0700 | 
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-03-22 20:28:52 -0700 | 
| commit | 819c837557cae318100505b418175ef0e5988eae (patch) | |
| tree | e5398862d87581215e5f932a962f7603b5f0cfad | |
| parent | d8c778bf99ffb02d61099e8b557b6fa827ad0429 (diff) | |
CHUI-889 : Fixed! Collapse/Expand of participants list in torn off panels
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 11 | 
1 files changed, 7 insertions, 4 deletions
| diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index eab2ce7798..0333bacd58 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -698,10 +698,12 @@ void LLFloaterIMSessionTab::updateHeaderAndToolbar()  			&& !mIsP2PChat;  	mParticipantListAndHistoryStack->collapsePanel(mParticipantListPanel, !is_participant_list_visible); +    mParticipantListPanel->setVisible(is_participant_list_visible);  	// Display collapse image (<<) if the floater is hosted  	// or if it is torn off but has an open control panel.  	bool is_expanded = is_not_torn_off || is_participant_list_visible; +      	mExpandCollapseBtn->setImageOverlay(getString(is_expanded ? "collapse_icon" : "expand_icon"));  	mExpandCollapseBtn->setToolTip(  			is_not_torn_off? @@ -818,14 +820,15 @@ void LLFloaterIMSessionTab::onSlide(LLFloaterIMSessionTab* self)  	{  		if (!self->mIsP2PChat)  		{ +            // The state must toggle the collapsed state of the panel              bool should_be_expanded = self->mParticipantListPanel->isCollapsed(); -			// Expand/collapse the participant list panel -            self->mParticipantListAndHistoryStack->collapsePanel(self->mParticipantListPanel, !should_be_expanded); -            self->mParticipantListPanel->setVisible(should_be_expanded); +			// Update the expand/collapse flag of the participant list panel and save it              gSavedSettings.setBOOL("IMShowControlPanel", should_be_expanded);              self->mIsParticipantListExpanded = should_be_expanded; -			self->mExpandCollapseBtn->setImageOverlay(self->getString(should_be_expanded ? "collapse_icon" : "expand_icon")); +             +            // Refresh for immediate feedback +            self->refreshConversation();  		}  	} | 
