Merge from default branch

--HG--
branch : product-engine

1 files changed, 8 insertions, 6 deletions

diff --git a/indra/llxuixml/lluicolor.cpp b/indra/llxuixml/lluicolor.cpp
index 424d878a6b..0049ec055c 100644
--- a/indra/llxuixml/lluicolor.cpp
+++ b/indra/llxuixml/lluicolor.cpp
@@ -16,13 +16,15 @@ LLUIColor::LLUIColor()
 {
 }
 
-LLUIColor::LLUIColor(const LLColor4* color)
-	:mColorPtr(color)
+
+LLUIColor::LLUIColor(const LLColor4& color)
+:	mColor(color), 
+	mColorPtr(NULL)
 {
 }
 
-LLUIColor::LLUIColor(const LLColor4& color)
-	:mColor(color), mColorPtr(NULL)
+LLUIColor::LLUIColor(const LLUIColor* color)
+:	mColorPtr(color)
 {
 }
 
@@ -32,14 +34,14 @@ void LLUIColor::set(const LLColor4& color)
 	mColorPtr = NULL;
 }
 
-void LLUIColor::set(const LLColor4* color)
+void LLUIColor::set(const LLUIColor* color)
 {
 	mColorPtr = color;
 }
 
 const LLColor4& LLUIColor::get() const
 {
-	return (mColorPtr == NULL ? mColor : *mColorPtr);
+	return (mColorPtr == NULL ? mColor : mColorPtr->get());
 }
 
 LLUIColor::operator const LLColor4& () const