1 files changed, 72 insertions, 9 deletions

diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index db32882438..0cd052eefa 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -43,6 +43,7 @@
 #include "llerror.h"
 #include "lltimer.h"
 
+#include "llaccordionctrltab.h"
 #include "llbutton.h"
 #include "llmenugl.h"
 //#include "llstatusbar.h"
@@ -79,6 +80,8 @@ LLPanel::Params::Params()
 	background_opaque("background_opaque", false),
 	bg_opaque_color("bg_opaque_color"),
 	bg_alpha_color("bg_alpha_color"),
+	bg_opaque_image_overlay("bg_opaque_image_overlay"),
+	bg_alpha_image_overlay("bg_alpha_image_overlay"),
 	bg_opaque_image("bg_opaque_image"),
 	bg_alpha_image("bg_alpha_image"),
 	min_width("min_width", 100),
@@ -102,6 +105,8 @@ LLPanel::LLPanel(const LLPanel::Params& p)
 	mBgOpaque(p.background_opaque),
 	mBgOpaqueColor(p.bg_opaque_color()),
 	mBgAlphaColor(p.bg_alpha_color()),
+	mBgOpaqueImageOverlay(p.bg_opaque_image_overlay),
+	mBgAlphaImageOverlay(p.bg_alpha_image_overlay),
 	mBgOpaqueImage(p.bg_opaque_image()),
 	mBgAlphaImage(p.bg_alpha_image()),
 	mDefaultBtn(NULL),
@@ -198,7 +203,7 @@ void LLPanel::draw()
 			// opaque, in-front look
 			if (mBgOpaqueImage.notNull())
 			{
-				mBgOpaqueImage->draw( local_rect, UI_VERTEX_COLOR % alpha );
+				mBgOpaqueImage->draw( local_rect, mBgOpaqueImageOverlay % alpha );
 			}
 			else
 			{
@@ -211,7 +216,7 @@ void LLPanel::draw()
 			// transparent, in-back look
 			if (mBgAlphaImage.notNull())
 			{
-				mBgAlphaImage->draw( local_rect, UI_VERTEX_COLOR % alpha );
+				mBgAlphaImage->draw( local_rect, mBgAlphaImageOverlay % alpha );
 			}
 			else
 			{
@@ -396,6 +401,12 @@ LLView* LLPanel::fromXML(LLXMLNodePtr node, LLView* parent, LLXMLNodePtr output_
 		if (!panelp)
 		{
 			panelp = LLUICtrlFactory::getInstance()->createFactoryPanel(name);
+			llassert(panelp);
+			
+			if (!panelp)
+			{
+				return NULL; // :(
+			}
 		}
 
 	}
@@ -413,7 +424,7 @@ LLView* LLPanel::fromXML(LLXMLNodePtr node, LLView* parent, LLXMLNodePtr output_
 	panelp->mCommitCallbackRegistrar.popScope();
 	panelp->mEnableCallbackRegistrar.popScope();
 
-	if (panelp && !panelp->getFactoryMap().empty())
+	if (!panelp->getFactoryMap().empty())
 	{
 		LLUICtrlFactory::instance().popFactoryFunctions();
 	}
@@ -474,6 +485,8 @@ void LLPanel::initFromParams(const LLPanel::Params& p)
 	setTransparentColor(p.bg_alpha_color().get());
 	mBgOpaqueImage = p.bg_opaque_image();
 	mBgAlphaImage = p.bg_alpha_image();
+	mBgOpaqueImageOverlay = p.bg_opaque_image_overlay;
+	mBgAlphaImageOverlay = p.bg_alpha_image_overlay;
 }
 
 static LLFastTimer::DeclareTimer FTM_PANEL_SETUP("Panel Setup");
@@ -851,14 +864,26 @@ static LLPanel *childGetVisibleTabWithHelp(LLView *parent)
 	// look through immediate children first for an active tab with help
 	for (child = parent->getFirstChild(); child; child = parent->findNextSibling(child))
 	{
+		LLPanel *curTabPanel = NULL;
+
+		// do we have a tab container?
 		LLTabContainer *tab = dynamic_cast<LLTabContainer *>(child);
 		if (tab && tab->getVisible())
 		{
-			LLPanel *curTabPanel = tab->getCurrentPanel();
-			if (curTabPanel && !curTabPanel->getHelpTopic().empty())
-			{
-				return curTabPanel;
-			}
+			curTabPanel = tab->getCurrentPanel();
+		}
+
+		// do we have an accordion tab?
+		LLAccordionCtrlTab* accordion = dynamic_cast<LLAccordionCtrlTab *>(child);
+		if (accordion && accordion->getDisplayChildren())
+		{
+			curTabPanel = dynamic_cast<LLPanel *>(accordion->getAccordionView());
+		}
+
+		// if we found a valid tab, does it have a help topic?
+		if (curTabPanel && !curTabPanel->getHelpTopic().empty())
+		{
+			return curTabPanel;
 		}
 	}
 
@@ -885,7 +910,45 @@ LLPanel *LLPanel::childGetVisibleTabWithHelp()
 	return ::childGetVisibleTabWithHelp(this);
 }
 
-void LLPanel::childSetPrevalidate(const std::string& id, BOOL (*func)(const LLWString &) )
+static LLPanel *childGetVisiblePanelWithHelp(LLView *parent)
+{
+	LLView *child;
+
+	// look through immediate children first for an active panel with help
+	for (child = parent->getFirstChild(); child; child = parent->findNextSibling(child))
+	{
+		// do we have a panel with a help topic?
+		LLPanel *panel = dynamic_cast<LLPanel *>(child);
+		if (panel && panel->getVisible() && !panel->getHelpTopic().empty())
+		{
+			return panel;
+		}
+	}
+
+	// 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()
+{
+	// 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)