1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llappearance/llpolymorph.cpp b/indra/llappearance/llpolymorph.cpp
index 8df8a9726f..5ee6649164 100644
--- a/indra/llappearance/llpolymorph.cpp
+++ b/indra/llappearance/llpolymorph.cpp
@@ -550,12 +550,12 @@ void LLPolyMorphTarget::apply( ESex avatar_sex )
 
     mLastSex = avatar_sex;
 
-    // Check for NaN condition (NaN is detected if a variable doesn't equal itself.
-    if (mCurWeight != mCurWeight)
+    // Check for NaN condition
+    if (llisnan(mCurWeight))
     {
-        mCurWeight = 0.0;
+        mCurWeight = 0.f;
     }
-    if (mLastWeight != mLastWeight)
+    if (llisnan(mLastWeight))
     {
         mLastWeight = mCurWeight+.001f;
     }