summaryrefslogtreecommitdiff
path: root/indra/llxuixml/lluicolor.h
diff options
context:
space:
mode:
authorrichard <none@none>2010-01-22 16:51:13 -0800
committerrichard <none@none>2010-01-22 16:51:13 -0800
commit337716d946cf4ece8ba59cce82bd51b3c2148f75 (patch)
tree3dee9d70847c017e00e0090692606058565bfdd3 /indra/llxuixml/lluicolor.h
parent41f2b8e6017c4846430f501dc3d4877b505b9fbd (diff)
LLPointer cleanup and fix for EXT-4413
reviewed by Rick
Diffstat (limited to 'indra/llxuixml/lluicolor.h')
-rw-r--r--indra/llxuixml/lluicolor.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llxuixml/lluicolor.h b/indra/llxuixml/lluicolor.h
index bb0f786326..0ef2f78b24 100644
--- a/indra/llxuixml/lluicolor.h
+++ b/indra/llxuixml/lluicolor.h
@@ -22,11 +22,11 @@ class LLUIColor
{
public:
LLUIColor();
- LLUIColor(const LLColor4* color);
LLUIColor(const LLColor4& color);
+ LLUIColor(const LLUIColor* color);
void set(const LLColor4& color);
- void set(const LLColor4* color);
+ void set(const LLUIColor* color);
const LLColor4& get() const;
@@ -38,7 +38,7 @@ public:
private:
friend struct LLInitParam::ParamCompare<LLUIColor, false>;
- const LLColor4* mColorPtr;
+ const LLUIColor* mColorPtr;
LLColor4 mColor;
};
@@ -47,7 +47,7 @@ namespace LLInitParam
template<>
struct ParamCompare<LLUIColor, false>
{
- static bool equals(const class LLUIColor& a, const class LLUIColor& b);
+ static bool equals(const LLUIColor& a, const LLUIColor& b);
};
}