From 16c22355107d4a3dfc595123492e8e76fb683e3b Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sat, 28 Apr 2012 21:34:24 -0400 Subject: [PATCH] Fixed About Floater's background. clear and transparent both refer to the same thing, code fix to reflect this. --- indra/llmath/v4color.cpp | 4 ++-- indra/newview/skins/default/xui/en-us/floater_about.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/llmath/v4color.cpp b/indra/llmath/v4color.cpp index 219b06ec7..660f59fbe 100644 --- a/indra/llmath/v4color.cpp +++ b/indra/llmath/v4color.cpp @@ -704,9 +704,9 @@ BOOL LLColor4::parseColor(const std::string& buf, LLColor4* color) { color->set(LLColor4::orange6); } - else if ( "clear" == color_name ) + else if ( "clear" == color_name || "transparent" == color_name ) { - color->set(0.f, 0.f, 0.f, 0.f); + color->set(LLColor4::transparent); } else { diff --git a/indra/newview/skins/default/xui/en-us/floater_about.xml b/indra/newview/skins/default/xui/en-us/floater_about.xml index 9fd019310..0f35260c8 100644 --- a/indra/newview/skins/default/xui/en-us/floater_about.xml +++ b/indra/newview/skins/default/xui/en-us/floater_about.xml @@ -22,7 +22,7 @@ follows="top|left" font="SansSerif" height="343" - bg_readonly_color="Transparent" + bg_readonly_color="transparent" left="1" max_length="65536" name="support_editor" @@ -49,7 +49,7 @@