diff options
Diffstat (limited to 'indra/llprimitive/lltextureentry.cpp')
| -rw-r--r-- | indra/llprimitive/lltextureentry.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp index 86952dfdb5..85ff779ba2 100644 --- a/indra/llprimitive/lltextureentry.cpp +++ b/indra/llprimitive/lltextureentry.cpp @@ -37,6 +37,7 @@ LLTextureEntry::LLTextureEntry(const LLTextureEntry &rhs) mColor = rhs.mColor; mBump = rhs.mBump; mMediaFlags = rhs.mMediaFlags; + mGlow = rhs.mGlow; } LLTextureEntry &LLTextureEntry::operator=(const LLTextureEntry &rhs) @@ -52,6 +53,7 @@ LLTextureEntry &LLTextureEntry::operator=(const LLTextureEntry &rhs) mColor = rhs.mColor; mBump = rhs.mBump; mMediaFlags = rhs.mMediaFlags; + mGlow = rhs.mGlow; } return *this; @@ -68,7 +70,8 @@ void LLTextureEntry::init(const LLUUID& tex_id, F32 scale_s, F32 scale_t, F32 of mRotation = rotation; mBump = bump; mMediaFlags = 0x0; - + mGlow = 0; + setColor(LLColor4(1.f, 1.f, 1.f, 1.f)); } @@ -346,3 +349,13 @@ S32 LLTextureEntry::setTexGen(U8 tex_gen) return 0; } +S32 LLTextureEntry::setGlow(F32 glow) +{ + if (mGlow != glow) + { + mGlow = glow; + return TEM_CHANGE_TEXTURE; + } + return 0; +} + |