From 925f01f6a066113049e8c829c6fc3875c69ef566 Mon Sep 17 00:00:00 2001
From: Martin Reddy <lynx@lindenlab.com>
Date: Thu, 15 Oct 2009 13:08:12 +0000
Subject: DEV-41253: Updated the help context calculation code so that it will
 now search through a panel's children to see if there are any visible tabs
 that have a help topic string defined. If so, we use this string.

Updated all of the XUI files that include a tab_container to define
help topic strings for their child panels. I named all of these strings
with the floater name as the prefix and "tab" at the end. For example,
"preferences_display_tab" or "people_nearby_tab".
---
 indra/llui/lluictrl.cpp | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'indra/llui/lluictrl.cpp')

diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 5b72f87a78..84b1c92097 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -795,16 +795,29 @@ bool LLUICtrl::findHelpTopic(std::string& help_topic_out)
 	LLUICtrl* ctrl = this;
 
 	// search back through the control's parents for a panel
-	// with a help_topic string defined
+	// or tab with a help_topic string defined
 	while (ctrl)
 	{
 		LLPanel *panel = dynamic_cast<LLPanel *>(ctrl);
-		if (panel && !panel->getHelpTopic().empty())
+
+		if (panel)
 		{
-			help_topic_out = panel->getHelpTopic();
-			return true; // success
+			// does the panel have an active tab with a help topic?
+			LLPanel *tab = panel->childGetVisibleTabWithHelp();
+			if (tab)
+			{
+				help_topic_out = tab->getHelpTopic();
+				return true; // success (tab)
+			}
+
+			// otherwise, does the panel have a help topic itself?
+			if (!panel->getHelpTopic().empty())
+			{
+				help_topic_out = panel->getHelpTopic();
+				return true; // success (panel)
+			}		
 		}
-		
+
 		ctrl = ctrl->getParentUICtrl();
 	}
 
-- 
cgit v1.2.3


From 5edb4f2171fb92ff64913459a63afb20474db25a Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Thu, 15 Oct 2009 19:56:45 +0000
Subject: removed requirement for specializing ParamCompare on boost::function
 types eliminated usage of iterator_range from LLInitParam made
 LLTextEditor::addChar consistent with truncate in counting text bytes (not
 including null terminator) EXT-1494 - Avatar profile description text
 truncated to 255 characters

reviewed by Leyla
---
 indra/llui/lluictrl.cpp | 21 ---------------------
 1 file changed, 21 deletions(-)

(limited to 'indra/llui/lluictrl.cpp')

diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 84b1c92097..0faff5eff6 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -849,24 +849,3 @@ BOOL LLUICtrl::getTentative() const
 // virtual
 void LLUICtrl::setColor(const LLColor4& color)							
 { }
-
-
-namespace LLInitParam
-{
-    template<> 
-	bool ParamCompare<LLUICtrl::commit_callback_t>::equals(
-		const LLUICtrl::commit_callback_t &a, 
-		const LLUICtrl::commit_callback_t &b)
-    {
-    	return false;
-    }
-    
-   
-    template<> 
-	bool ParamCompare<LLUICtrl::enable_callback_t>::equals(
-		const LLUICtrl::enable_callback_t &a, 
-		const LLUICtrl::enable_callback_t &b)
-    {
-    	return false;
-    }
-}
-- 
cgit v1.2.3