EXT-1013 - tab ordering is inconsistent in the preferences window

reviewed by James

3 files changed, 3 insertions, 14 deletions

diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index 1695aee2b8..69ff3dddc3 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -522,7 +522,7 @@ BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr outpu
 		// be built/added. JC
 		if (parent)
 		{
-			S32 tab_group = params.tab_group.isProvided() ? params.tab_group() : -1;
+			S32 tab_group = params.tab_group.isProvided() ? params.tab_group() : parent->getLastTabGroup();
 			parent->addChild(this, tab_group);
 		}
 
diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp
index 4ce6677294..d8633453a8 100644
--- a/indra/llui/lluictrlfactory.cpp
+++ b/indra/llui/lluictrlfactory.cpp
@@ -379,14 +379,6 @@ BOOL LLUICtrlFactory::getAttributeColor(LLXMLNodePtr node, const std::string& na
 	return res;
 }
 
-//static
-void LLUICtrlFactory::setCtrlParent(LLView* view, LLView* parent, S32 tab_group)
-{
-	if (tab_group < 0) tab_group = parent->getLastTabGroup();
-	parent->addChild(view, tab_group);
-}
-
-
 // Avoid directly using LLUI and LLDir in the template code
 //static
 std::string LLUICtrlFactory::findSkinnedFilename(const std::string& filename)
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h
index e47010c316..5a028702e7 100644
--- a/indra/llui/lluictrlfactory.h
+++ b/indra/llui/lluictrlfactory.h
@@ -295,8 +295,8 @@ fail:
 
 		if (parent)
 		{
-			S32 tab_group = params.tab_group.isProvided() ? params.tab_group() : -1;
-			setCtrlParent(widget, parent, tab_group);
+			S32 tab_group = params.tab_group.isProvided() ? params.tab_group() : parent->getLastTabGroup();
+			parent->addChild(widget, tab_group);
 		}
 		
 		typedef typename T::child_registry_t registry_t;
@@ -321,9 +321,6 @@ fail:
 	static void loadWidgetTemplate(const std::string& widget_tag, LLInitParam::BaseBlock& block);
 
 private:
-	//static void setCtrlValue(LLView* view, LLXMLNodePtr node);
-	static void setCtrlParent(LLView* view, LLView* parent, S32 tab_group);
-
 	// Avoid directly using LLUI and LLDir in the template code
 	static std::string findSkinnedFilename(const std::string& filename);