diff options
| author | Richard Linden <none@none> | 2010-06-02 15:33:37 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-02 15:33:37 -0700 |
| commit | 6d69f054785ea16c2c1cb6c091328140f2504089 (patch) | |
| tree | 5c0b7eb13d337aa223175468a926aa9e64594476 /indra/newview/llcolorswatch.cpp | |
| parent | 1e13fd9260696e10df05dcb81803649c805b95cd (diff) | |
| parent | a541c1d53ed2e7bce713b742684d5e16320d8100 (diff) | |
merge
Diffstat (limited to 'indra/newview/llcolorswatch.cpp')
| -rw-r--r-- | indra/newview/llcolorswatch.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp index dc6847f236..d079da3b36 100644 --- a/indra/newview/llcolorswatch.cpp +++ b/indra/newview/llcolorswatch.cpp @@ -68,7 +68,7 @@ LLColorSwatchCtrl::Params::Params() LLColorSwatchCtrl::LLColorSwatchCtrl(const Params& p) : LLUICtrl(p), mValid( TRUE ), - mColor(p.color), + mColor(p.color()), mCanApplyImmediately(p.can_apply_immediately), mAlphaGradientImage(p.alpha_background_image), mOnCancelCallback(p.cancel_callback()), |