livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Karl Steifvater 2007-08-16 00:59:41 +00:00
parent e8e6679454
commit b699ae454d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llprimitive/lltextureentry.cpp
View File

@ -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: