summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-01 07:22:32 -0500
committerOz Linden <oz@lindenlab.com>2011-02-01 07:22:32 -0500
commitf0074f1002f36ad680ae04daf3f5e026dca31d54 (patch)
treee55cad847d3dbd156b8386272d0778bdf952c33a /indra/llprimitive
parent1aa01ad67fbe15ed43d8bb0bc7fb34a076a484b0 (diff)
parented308d15bf2f88f91687411cd92f6cc55b1e75b4 (diff)
merge changes back from beta branch
Diffstat (limited to 'indra/llprimitive')
-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;