From 35feb03d27036f82a6bca60c1be8d864de990646 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 12 Dec 2011 15:50:10 -0800
Subject: EXP-1711 FIX LLWindowShade doesn't stack multiple notifications added
 configurable shade color to window_shade

---
 indra/llui/llwindowshade.cpp | 3 ++-
 indra/llui/llwindowshade.h   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llwindowshade.cpp b/indra/llui/llwindowshade.cpp
index 0b4cfe68a6..1e8b47de29 100644
--- a/indra/llui/llwindowshade.cpp
+++ b/indra/llui/llwindowshade.cpp
@@ -43,6 +43,7 @@ LLWindowShade::Params::Params()
 :	bg_image("bg_image"),
 	modal("modal", false),
 	text_color("text_color"),
+	shade_color("shade_color"),
 	can_close("can_close", true)
 {
 	changeDefault(mouse_opaque, false);
@@ -90,7 +91,7 @@ void LLWindowShade::initFromParams(const LLWindowShade::Params& params)
 	panel_p.name = "background_area";
 	panel_p.mouse_opaque = false;
 	panel_p.background_visible = false;
-	panel_p.bg_alpha_color = LLColor4(0.f, 0.f, 0.f, 0.2f);
+	panel_p.bg_alpha_color = params.shade_color;
 	LLLayoutPanel* dummy_panel = LLUICtrlFactory::create<LLLayoutPanel>(panel_p);
 	stackp->addChild(dummy_panel);
 
diff --git a/indra/llui/llwindowshade.h b/indra/llui/llwindowshade.h
index 1dcab4e32f..1ae84028dd 100644
--- a/indra/llui/llwindowshade.h
+++ b/indra/llui/llwindowshade.h
@@ -37,7 +37,8 @@ public:
 	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
 	{
 		Optional<LLUIImage*>			bg_image;
-		Optional<LLUIColor>				text_color;
+		Optional<LLUIColor>				text_color,
+										shade_color;
 		Optional<bool>					modal,
 										can_close;
 
-- 
cgit v1.2.3