diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-04 13:58:18 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-04 13:58:18 +0300 |
| commit | 15711b29afd293acd23d948a51ea65795335c95f (patch) | |
| tree | 8fdbb8e7275ed5d16a19d8bc3434b69d687b0b61 /indra/newview/llcolorswatch.cpp | |
| parent | 9345f01d4b61f857ed540cf725c8cd0ee1b0ef24 (diff) | |
| parent | e1189d0e2ee47539edc68c3532e0a5ce64d5dcd1 (diff) | |
merge
--HG--
branch : product-engine
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()), |