merge -r 57111:57464 maintenance.

1 files changed, 9 insertions, 3 deletions

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index b37602093f..8dc0ce5f66 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -506,7 +506,8 @@ void LLFloater::open()	/* Flawfinder: ignore */
 	if (sHostp != NULL && hostp == NULL)
 	{
 		// needs a host
-		sHostp->addFloater(this, TRUE);
+		// only select tabs if window they are hosted in is visible
+		sHostp->addFloater(this, sHostp->getVisible());
 	}
 	else if (hostp != NULL)
 	{
@@ -2578,8 +2579,6 @@ void LLMultiFloater::addFloater(LLFloater* floaterp, BOOL select_added_floater,
 	if ( select_added_floater )
 	{
 		mTabContainer->selectLastTab();
-		// explicitly call tabopen to load preview assets, etc.
-		tabOpen((LLFloater*)mTabContainer->getCurrentPanel(), true);
 	}
 
 	floaterp->setHost(this);
@@ -2702,6 +2701,13 @@ void LLMultiFloater::setVisible(BOOL visible)
 		{
 			cur_floaterp->setVisible(visible);
 		}
+
+		// if no tab selected, and we're being shown,
+		// select last tab to be added
+		if (visible && !cur_floaterp)
+		{
+			mTabContainer->selectLastTab();
+		}
 	}
 }