From 029130bf9c76139fa836117987b60e801ac7ec7c Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Wed, 23 May 2007 21:17:34 +0000
Subject: svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339
 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341  ->
 release

---
 indra/llprimitive/lltextureentry.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'indra/llprimitive/lltextureentry.h')

diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h
index b9558a159a..f8cdd3bee1 100644
--- a/indra/llprimitive/lltextureentry.h
+++ b/indra/llprimitive/lltextureentry.h
@@ -87,7 +87,8 @@ public:
 	S32  setMediaFlags(U8 media_flags);
 	S32	 setTexGen(U8 texGen);
 	S32  setMediaTexGen(U8 media);
-
+    S32  setGlow(F32 glow);
+	
 	const LLUUID &getID() const { return mID; }
 	const LLColor4 &getColor() const { return mColor; }
 	void getScale(F32 *s, F32 *t) const { *s = mScaleS; *t = mScaleT; }
@@ -104,7 +105,8 @@ public:
 	U8	 getMediaFlags() const { return mMediaFlags & TEM_MEDIA_MASK; }
 	U8	 getTexGen() const	{ return mMediaFlags & TEM_TEX_GEN_MASK; }
 	U8	 getMediaTexGen() const { return mMediaFlags; }
-
+    F32  getGlow() const { return mGlow; }
+	
 	// Media flags
 	enum { MF_NONE = 0x0, MF_WEB_PAGE = 0x1 };
 
@@ -121,6 +123,8 @@ protected:
 	LLColor4			mColor;
 	U8					mBump;					// Bump map, shiny, and fullbright
 	U8					mMediaFlags;			// replace with web page, movie, etc.
+	F32                 mGlow;
+	
 };
 
 #endif
-- 
cgit v1.2.3