diff options
| author | Richard Linden <none@none> | 2010-06-02 14:46:18 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-02 14:46:18 -0700 |
| commit | 2d107f4349cfcc3fe2b59a0d95ee75ee50134205 (patch) | |
| tree | f155e3d39d220443b389f65c29e0c909373102d1 /indra/newview/llcolorswatch.cpp | |
| parent | c1aaca36aefff1154a2cd0069d46d466ce39b83a (diff) | |
| parent | 141ea0f89628c92959c21b949fd2ff7a9cb50d9f (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()), |