Merge changes

1 files changed, 4 insertions, 2 deletions

diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index 5f0fbe6ee5..438b1b558f 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -281,7 +281,7 @@ bool        LLSideTray::addTab          ( const std::string& tab_name
 
 LLSideTrayTab* LLSideTray::getTab(const std::string& name)
 {
-	return getChild<LLSideTrayTab>(name,false,false);
+	return getChild<LLSideTrayTab>(name,false);
 }
 
 
@@ -311,7 +311,7 @@ bool LLSideTray::selectTabByName	(const std::string& name)
 {
 	LLSideTrayTab* side_bar = getTab(name);
 
-	if(side_bar == NULL || side_bar == mActiveTab)
+	if(side_bar == mActiveTab)
 		return false;
 	//deselect old tab
 	toggleTabButton(mActiveTab);
@@ -508,6 +508,8 @@ void LLSideTray::expandSideBar	()
 {
 	mCollapsed = false;
 	mCollapseButton->setLabel(EXPANDED_NAME);
+	LLSD key;//empty
+	mActiveTab->onOpen(key);
 	mActiveTab->setVisible(TRUE);
 
 	reflectCollapseChange();