merge -r67812:67818 svn+ssh://svn.lindenlab.com/svn/linden/branches/windlight-server/ --> release

1 files changed, 10 insertions, 2 deletions

diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp
index 85ff779ba2..852933fa2f 100644
--- a/indra/llprimitive/lltextureentry.cpp
+++ b/indra/llprimitive/lltextureentry.cpp
@@ -89,7 +89,8 @@ bool LLTextureEntry::operator!=(const LLTextureEntry &rhs) const
 	if (mRotation != rhs.mRotation) return(true);
 	if (mColor != rhs.mColor) return (true);
 	if (mBump != rhs.mBump) return (true);
-	if (mMediaFlags != rhs.mMediaFlags) return true;
+	if (mMediaFlags != rhs.mMediaFlags) return (true);
+	if (mGlow != rhs.mGlow) return (true);
 	return(false);
 }
 
@@ -104,6 +105,7 @@ bool LLTextureEntry::operator==(const LLTextureEntry &rhs) const
 	if (mColor != rhs.mColor) return (false);
 	if (mBump != rhs.mBump) return (false);
 	if (mMediaFlags != rhs.mMediaFlags) return false;
+	if (mGlow != rhs.mGlow) return false;
 	return(true);
 }
 
@@ -121,7 +123,8 @@ LLSD LLTextureEntry::asLLSD() const
 	sd["bump"] = getBumpShiny();
 	sd["fullbright"] = getFullbright();
 	sd["media_flags"] = getMediaTexGen();
-
+	sd["glow"] = getGlow();
+	
 	return sd;
 }
 
@@ -170,6 +173,11 @@ bool LLTextureEntry::fromLLSD(LLSD& sd)
 	{
 		setMediaTexGen( sd[w].asInteger() );
 	} else goto fail;
+	w = "glow";
+	if (sd.has(w))
+	{
+		setGlow((F32)sd[w].asReal() );
+	}
 
 	return true;
 fail: