diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-10-16 11:13:45 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-10-16 11:13:45 -0700 |
| commit | b4d1b1c43b4cf046a4a9df1911b5edc2d92d0a7b (patch) | |
| tree | 6d48ed401b0c50db22436d2387f60bacd6ed48c9 /indra/newview/llfloatereditwater.cpp | |
| parent | cc22ffc6d799544e8f2a9dfed6813081d908c88d (diff) | |
Removed conversions from WLColor Control in favor of setter/getter
Diffstat (limited to 'indra/newview/llfloatereditwater.cpp')
| -rw-r--r-- | indra/newview/llfloatereditwater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatereditwater.cpp b/indra/newview/llfloatereditwater.cpp index 41180b5da8..b025680da1 100644 --- a/indra/newview/llfloatereditwater.cpp +++ b/indra/newview/llfloatereditwater.cpp @@ -286,7 +286,7 @@ void LLFloaterEditWater::onExpFloatControlMoved(LLUICtrl* ctrl, WLXFloatControl* void LLFloaterEditWater::onColorControlMoved(LLUICtrl* ctrl, WLColorControl* color_ctrl) { LLColorSwatchCtrl* swatch = static_cast<LLColorSwatchCtrl*>(ctrl); - *color_ctrl = swatch->get(); + color_ctrl->setColor4( swatch->get() ); color_ctrl->update(mEditSettings); } |