diff options
Diffstat (limited to 'linden/indra/llprimitive/lltextureentry.cpp')
-rw-r--r-- | linden/indra/llprimitive/lltextureentry.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/linden/indra/llprimitive/lltextureentry.cpp b/linden/indra/llprimitive/lltextureentry.cpp index 81bfd6f..4f329f2 100644 --- a/linden/indra/llprimitive/lltextureentry.cpp +++ b/linden/indra/llprimitive/lltextureentry.cpp | |||
@@ -57,6 +57,7 @@ LLTextureEntry::LLTextureEntry(const LLTextureEntry &rhs) | |||
57 | mColor = rhs.mColor; | 57 | mColor = rhs.mColor; |
58 | mBump = rhs.mBump; | 58 | mBump = rhs.mBump; |
59 | mMediaFlags = rhs.mMediaFlags; | 59 | mMediaFlags = rhs.mMediaFlags; |
60 | mGlow = rhs.mGlow; | ||
60 | } | 61 | } |
61 | 62 | ||
62 | LLTextureEntry &LLTextureEntry::operator=(const LLTextureEntry &rhs) | 63 | LLTextureEntry &LLTextureEntry::operator=(const LLTextureEntry &rhs) |
@@ -72,6 +73,7 @@ LLTextureEntry &LLTextureEntry::operator=(const LLTextureEntry &rhs) | |||
72 | mColor = rhs.mColor; | 73 | mColor = rhs.mColor; |
73 | mBump = rhs.mBump; | 74 | mBump = rhs.mBump; |
74 | mMediaFlags = rhs.mMediaFlags; | 75 | mMediaFlags = rhs.mMediaFlags; |
76 | mGlow = rhs.mGlow; | ||
75 | } | 77 | } |
76 | 78 | ||
77 | return *this; | 79 | return *this; |
@@ -88,7 +90,8 @@ void LLTextureEntry::init(const LLUUID& tex_id, F32 scale_s, F32 scale_t, F32 of | |||
88 | mRotation = rotation; | 90 | mRotation = rotation; |
89 | mBump = bump; | 91 | mBump = bump; |
90 | mMediaFlags = 0x0; | 92 | mMediaFlags = 0x0; |
91 | 93 | mGlow = 0; | |
94 | |||
92 | setColor(LLColor4(1.f, 1.f, 1.f, 1.f)); | 95 | setColor(LLColor4(1.f, 1.f, 1.f, 1.f)); |
93 | } | 96 | } |
94 | 97 | ||
@@ -366,3 +369,13 @@ S32 LLTextureEntry::setTexGen(U8 tex_gen) | |||
366 | return 0; | 369 | return 0; |
367 | } | 370 | } |
368 | 371 | ||
372 | S32 LLTextureEntry::setGlow(F32 glow) | ||
373 | { | ||
374 | if (mGlow != glow) | ||
375 | { | ||
376 | mGlow = glow; | ||
377 | return TEM_CHANGE_TEXTURE; | ||
378 | } | ||
379 | return 0; | ||
380 | } | ||
381 | |||