removed visiblewhenminimized logic pending redesign

2 files changed, 4 insertions, 22 deletions

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 81b14aac17..fa533e8153 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -252,7 +252,6 @@ LLFloater::LLFloater(const LLSD& key, const LLFloater::Params& p)
 	mHeaderHeight(p.header_height),
 	mLegacyHeaderHeight(p.legacy_header_height),
 	mMinimized(FALSE),
-	mVisibleWhenMinimized(TRUE),
 	mForeground(FALSE),
 	mFirstLook(TRUE),
 	mButtonScale(1.0f),
@@ -1433,17 +1432,6 @@ void LLFloater::removeDependentFloater(LLFloater* floaterp)
 	floaterp->mDependeeHandle = LLHandle<LLFloater>();
 }
 
-void LLFloater::setVisibleWhenMinimized(bool visible)
-{ 
-	mVisibleWhenMinimized = visible;
-	if (visible && isMinimized())
-	{
-		// restack in minimized stack
-		setMinimized(FALSE);
-		setMinimized(TRUE);
-	}
-}
-
 BOOL LLFloater::offerClickToButton(S32 x, S32 y, MASK mask, EFloaterButton index)
 {
 	if( mButtonsEnabled[index] )
@@ -1820,14 +1808,11 @@ void LLFloater::draw()
 	}
 	if (isMinimized())
 	{
-		if (mVisibleWhenMinimized)
+		for (S32 i = 0; i < BUTTON_COUNT; i++)
 		{
-			for (S32 i = 0; i < BUTTON_COUNT; i++)
-			{
-				drawChild(mButtons[i]);
-			}
-			drawChild(mDragHandle);
+			drawChild(mButtons[i]);
 		}
+		drawChild(mDragHandle);
 	}
 	else
 	{
@@ -2482,7 +2467,7 @@ void LLFloaterView::getMinimizePosition(S32 *left, S32 *bottom)
 			{
 				// Examine minimized children.
 				LLFloater* floater = (LLFloater*)((LLView*)*child_it);
-				if(floater->isMinimized() && floater->getVisibleWhenMinimized()) 
+				if(floater->isMinimized()) 
 				{
 					LLRect r = floater->getRect();
 					if((r.mBottom < (row + floater_header_size))
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 7cfec09e5f..8beb11507e 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -217,8 +217,6 @@ public:
 	LLFloater*		getDependee() { return (LLFloater*)mDependeeHandle.get(); }
 	void		removeDependentFloater(LLFloater* dependent);
 	BOOL			isMinimized() const				{ return mMinimized; }
-	void			setVisibleWhenMinimized(bool visible);
-	bool			getVisibleWhenMinimized() const				{ return mVisibleWhenMinimized;}
 	/// isShown() differs from getVisible() in that isShown() also considers
 	/// isMinimized(). isShown() is true only if visible and not minimized.
 	bool			isShown() const;
@@ -429,7 +427,6 @@ private:
 	S32				mLegacyHeaderHeight;// HACK see initFloaterXML()
 	
 	BOOL			mMinimized;
-	bool			mVisibleWhenMinimized;
 	BOOL			mForeground;
 	LLHandle<LLFloater>	mDependeeHandle;