From d181b84dfdce83d1999d086c3eda2cdc51849a11 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 10 Nov 2009 17:10:47 -0800
Subject: EXT-1478   	 Tool-tip background and border colors are being
 ignored EXT-2082   	 Multifloater preview tab container extends outside
 window border EXT-773   	 odd notecard behaviour on closing an unsaved
 notcard reviewed by Richard

---
 indra/llui/lluiimage.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/indra/llui/lluiimage.cpp b/indra/llui/lluiimage.cpp
index 6c1a32722f..a8683e55c3 100644
--- a/indra/llui/lluiimage.cpp
+++ b/indra/llui/lluiimage.cpp
@@ -142,6 +142,13 @@ namespace LLInitParam
 {
 	LLUIImage* TypedParam<LLUIImage*>::getValueFromBlock() const
 	{
+		// The keyword "none" is specifically requesting a null image
+		// do not default to current value. Used to overwrite template images. 
+		if (name() == "none")
+		{
+			return NULL;
+		}
+
 		LLUIImage* imagep =  LLUI::getUIImage(name());
 		if (!imagep)
 		{
-- 
cgit v1.2.3