diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-06-03 14:40:10 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-06-03 14:40:10 -0400 |
| commit | a3246a301623f80edb109391c851774cf459fbe8 (patch) | |
| tree | 57dce21a2e37eb9f9770dda9ef01a36c064cf561 /indra/newview/llcolorswatch.cpp | |
| parent | 4f95701895a07066d5b46649d720335da1b62e71 (diff) | |
| parent | 797c1dbc6ef1c51755dcace98caf0c493cd8f511 (diff) | |
automated 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()), |