diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-02-23 16:54:34 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-02-23 16:54:34 -0500 |
| commit | 1f2fcc12980dd21659bce493431b7a1b3fe2ef00 (patch) | |
| tree | 7a678b096eaa89f655c7e74fb2aacf57b38afe77 /indra/llmath/v4color.h | |
| parent | f0b256b1cb6c96aed81ee456e505247fd2169c5f (diff) | |
| parent | ae0b3149badf369eb2b1f10aba830eef8b4af9b4 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64-c-11
Diffstat (limited to 'indra/llmath/v4color.h')
| -rw-r--r-- | indra/llmath/v4color.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmath/v4color.h b/indra/llmath/v4color.h index 0d632f59be..8f353ead5a 100644 --- a/indra/llmath/v4color.h +++ b/indra/llmath/v4color.h @@ -131,7 +131,7 @@ class LLColor4 friend const LLColor4& operator*=(LLColor4 &a, const LLColor4 &b); // Doesn't multiply alpha! (for lighting) // conversion - operator const LLColor4U() const; + operator LLColor4U() const; // Basic color values. static LLColor4 red; |