diff options
Diffstat (limited to 'linden/indra/llprimitive/lltextureentry.h')
-rw-r--r-- | linden/indra/llprimitive/lltextureentry.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linden/indra/llprimitive/lltextureentry.h b/linden/indra/llprimitive/lltextureentry.h index 861b585..c1f355b 100644 --- a/linden/indra/llprimitive/lltextureentry.h +++ b/linden/indra/llprimitive/lltextureentry.h | |||
@@ -107,7 +107,8 @@ public: | |||
107 | S32 setMediaFlags(U8 media_flags); | 107 | S32 setMediaFlags(U8 media_flags); |
108 | S32 setTexGen(U8 texGen); | 108 | S32 setTexGen(U8 texGen); |
109 | S32 setMediaTexGen(U8 media); | 109 | S32 setMediaTexGen(U8 media); |
110 | 110 | S32 setGlow(F32 glow); | |
111 | |||
111 | const LLUUID &getID() const { return mID; } | 112 | const LLUUID &getID() const { return mID; } |
112 | const LLColor4 &getColor() const { return mColor; } | 113 | const LLColor4 &getColor() const { return mColor; } |
113 | void getScale(F32 *s, F32 *t) const { *s = mScaleS; *t = mScaleT; } | 114 | void getScale(F32 *s, F32 *t) const { *s = mScaleS; *t = mScaleT; } |
@@ -124,7 +125,8 @@ public: | |||
124 | U8 getMediaFlags() const { return mMediaFlags & TEM_MEDIA_MASK; } | 125 | U8 getMediaFlags() const { return mMediaFlags & TEM_MEDIA_MASK; } |
125 | U8 getTexGen() const { return mMediaFlags & TEM_TEX_GEN_MASK; } | 126 | U8 getTexGen() const { return mMediaFlags & TEM_TEX_GEN_MASK; } |
126 | U8 getMediaTexGen() const { return mMediaFlags; } | 127 | U8 getMediaTexGen() const { return mMediaFlags; } |
127 | 128 | F32 getGlow() const { return mGlow; } | |
129 | |||
128 | // Media flags | 130 | // Media flags |
129 | enum { MF_NONE = 0x0, MF_WEB_PAGE = 0x1 }; | 131 | enum { MF_NONE = 0x0, MF_WEB_PAGE = 0x1 }; |
130 | 132 | ||
@@ -141,6 +143,8 @@ protected: | |||
141 | LLColor4 mColor; | 143 | LLColor4 mColor; |
142 | U8 mBump; // Bump map, shiny, and fullbright | 144 | U8 mBump; // Bump map, shiny, and fullbright |
143 | U8 mMediaFlags; // replace with web page, movie, etc. | 145 | U8 mMediaFlags; // replace with web page, movie, etc. |
146 | F32 mGlow; | ||
147 | |||
144 | }; | 148 | }; |
145 | 149 | ||
146 | #endif | 150 | #endif |