merge heads. whew.

1 files changed, 17 insertions, 49 deletions

diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index 6fe36bbc0c..b2e08c48c5 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -655,7 +655,7 @@ void LLPanel::childSetEnabled(const std::string& id, bool enabled)
 
 void LLPanel::childSetTentative(const std::string& id, bool tentative)
 {
-	LLView* child = findChild<LLView>(id);
+	LLUICtrl* child = findChild<LLUICtrl>(id);
 	if (child)
 	{
 		child->setTentative(tentative);
@@ -854,13 +854,16 @@ LLPanel *LLPanel::childGetVisibleTab(const std::string& id) const
 	return NULL;
 }
 
-static LLPanel *childGetVisibleTabWithHelp(LLView *parent)
+LLPanel* LLPanel::childGetVisibleTabWithHelp()
 {
 	LLView *child;
 
-	// look through immediate children first for an active tab with help
-	for (child = parent->getFirstChild(); child; child = parent->findNextSibling(child))
+	bfs_tree_iterator_t it = beginTreeBFS();
+	// skip ourselves
+	++it;
+	for (; it != endTreeBFS(); ++it)
 	{
+		child = *it;
 		LLPanel *curTabPanel = NULL;
 
 		// do we have a tab container?
@@ -884,36 +887,21 @@ static LLPanel *childGetVisibleTabWithHelp(LLView *parent)
 		}
 	}
 
-	// then try a bit harder and recurse through all children
-	for (child = parent->getFirstChild(); child; child = parent->findNextSibling(child))
-	{
-		if (child->getVisible())
-		{
-			LLPanel* tab = ::childGetVisibleTabWithHelp(child);
-			if (tab)
-			{
-				return tab;
-			}
-		}
-	}
-
 	// couldn't find any active tabs with a help topic string
 	return NULL;
 }
 
-LLPanel *LLPanel::childGetVisibleTabWithHelp()
-{
-	// find a visible tab with a help topic (to determine help context)
-	return ::childGetVisibleTabWithHelp(this);
-}
 
-static LLPanel *childGetVisiblePanelWithHelp(LLView *parent)
+LLPanel *LLPanel::childGetVisiblePanelWithHelp()
 {
 	LLView *child;
 
-	// look through immediate children first for an active panel with help
-	for (child = parent->getFirstChild(); child; child = parent->findNextSibling(child))
+	bfs_tree_iterator_t it = beginTreeBFS();
+	// skip ourselves
+	++it;
+	for (; it != endTreeBFS(); ++it)
 	{
+		child = *it;
 		// do we have a panel with a help topic?
 		LLPanel *panel = dynamic_cast<LLPanel *>(child);
 		if (panel && panel->getVisible() && !panel->getHelpTopic().empty())
@@ -922,39 +910,19 @@ static LLPanel *childGetVisiblePanelWithHelp(LLView *parent)
 		}
 	}
 
-	// then try a bit harder and recurse through all children
-	for (child = parent->getFirstChild(); child; child = parent->findNextSibling(child))
-	{
-		if (child->getVisible())
-		{
-			LLPanel* panel = ::childGetVisiblePanelWithHelp(child);
-			if (panel)
-			{
-				return panel;
-			}
-		}
-	}
-
 	// couldn't find any active panels with a help topic string
 	return NULL;
 }
 
-LLPanel *LLPanel::childGetVisiblePanelWithHelp()
+void LLPanel::childSetAction(const std::string& id, const commit_signal_t::slot_type& function)
 {
-	// find a visible tab with a help topic (to determine help context)
-	return ::childGetVisiblePanelWithHelp(this);
-}
-
-void LLPanel::childSetPrevalidate(const std::string& id, bool (*func)(const LLWString &) )
-{
-	LLLineEditor* child = findChild<LLLineEditor>(id);
-	if (child)
+	LLButton* button = findChild<LLButton>(id);
+	if (button)
 	{
-		child->setPrevalidate(func);
+		button->setClickedCallback(function);
 	}
 }
 
-
 void LLPanel::childSetAction(const std::string& id, boost::function<void(void*)> function, void* value)
 {
 	LLButton* button = findChild<LLButton>(id);