diff options
Diffstat (limited to 'indra/llui/lldockablefloater.cpp')
| -rw-r--r-- | indra/llui/lldockablefloater.cpp | 7 | 
1 files changed, 6 insertions, 1 deletions
| diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp index ca2dc644a4..aea58be12a 100644 --- a/indra/llui/lldockablefloater.cpp +++ b/indra/llui/lldockablefloater.cpp @@ -162,10 +162,15 @@ void LLDockableFloater::setVisible(BOOL visible)  void LLDockableFloater::setMinimized(BOOL minimize)  { -	if(minimize) +	if(minimize && isDocked())  	{ +		// minimizing a docked floater just hides it  		setVisible(FALSE);  	} +	else +	{ +		LLFloater::setMinimized(minimize); +	}  }  LLView * LLDockableFloater::getDockWidget() | 
