summaryrefslogtreecommitdiff
path: root/indra/llprimitive/lltextureentry.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-01-21 16:25:23 -0700
committerXiaohong Bao <bao@lindenlab.com>2011-01-21 16:25:23 -0700
commit4af7e9eb64097c9fdcef86758fc42932d3ccd477 (patch)
tree3d4d5300b0c476d8343baad8d28c0809806d5c8b /indra/llprimitive/lltextureentry.cpp
parentbb3be2c07f492577254ae9ace5675eb92d10f061 (diff)
parente3f5b66d5a649b061e470bba44fa29a56f7b93b5 (diff)
Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: Viewer attempting to load precached images in file types that are not being used.)
Diffstat (limited to 'indra/llprimitive/lltextureentry.cpp')
-rw-r--r--indra/llprimitive/lltextureentry.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp
index 3c1d031ff5..861bde5c89 100644
--- a/indra/llprimitive/lltextureentry.cpp
+++ b/indra/llprimitive/lltextureentry.cpp
@@ -403,7 +403,7 @@ S32 LLTextureEntry::setOffsetT(F32 t)
S32 LLTextureEntry::setRotation(F32 theta)
{
- if (mRotation != theta)
+ if (mRotation != theta && llfinite(theta))
{
mRotation = theta;
return TEM_CHANGE_TEXTURE;