diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-11-08 12:32:36 +0200 | 
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-11-08 12:32:36 +0200 | 
| commit | a8e74f20bac8c1cb708e645e460d9435a2fff1db (patch) | |
| tree | c7146891fb5b849f990e9cc5ea3dad7f205e3aa9 | |
| parent | aaf6c7954d83917d2c461bf606cac6b446a5a0ba (diff) | |
MAINT-3400 FIXED Reshape IMSession floater after expanding participant list.
| -rwxr-xr-x | indra/newview/llfloaterimsessiontab.cpp | 7 | 
1 files changed, 6 insertions, 1 deletions
| diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index 0ccfdb9a7b..29511f56ff 100755 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -825,6 +825,7 @@ void LLFloaterIMSessionTab::updateCallBtnState(bool callIsActive)  void LLFloaterIMSessionTab::onSlide(LLFloaterIMSessionTab* self)  {  	LLFloaterIMContainer* host_floater = dynamic_cast<LLFloaterIMContainer*>(self->getHost()); +	bool should_be_expanded = false;  	if (host_floater)  	{  		// Hide the messages pane if a floater is hosted in the Conversations @@ -835,7 +836,7 @@ 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(); +           should_be_expanded = self->mParticipantListPanel->isCollapsed();  			// Update the expand/collapse flag of the participant list panel and save it              gSavedSettings.setBOOL("IMShowControlPanel", should_be_expanded); @@ -847,6 +848,10 @@ void LLFloaterIMSessionTab::onSlide(LLFloaterIMSessionTab* self)  	}  	self->assignResizeLimits(); +	if (should_be_expanded) +	{ +		self->forceReshape(); +	}  }  void LLFloaterIMSessionTab::onCollapseToLine(LLFloaterIMSessionTab* self) | 
