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/llenvadapters.h | |
parent | cc22ffc6d799544e8f2a9dfed6813081d908c88d (diff) |
Removed conversions from WLColor Control in favor of setter/getter
Diffstat (limited to 'indra/newview/llenvadapters.h')
-rw-r--r-- | indra/newview/llenvadapters.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/newview/llenvadapters.h b/indra/newview/llenvadapters.h index 3241e43191..8b93bbbe9f 100644 --- a/indra/newview/llenvadapters.h +++ b/indra/newview/llenvadapters.h @@ -51,18 +51,22 @@ public: mIsBlueHorizonOrDensity = (mSliderName == "WLBlueHorizon" || mSliderName == "WLBlueDensity"); } - inline WLColorControl & operator = (const LLColor4 & val) + inline void setColor4(const LLColor4 & val) + { + mColor = val; + } + + inline void setColor3(const LLColor3 & val) { mColor = val; - return *this; } - inline operator LLColor4 (void) const + inline LLColor4 getColor4() const { return mColor; } - inline operator LLColor3 (void) const + inline LLColor3 getColor3(void) const { return vec4to3(mColor); } |