1 files changed, 6 insertions, 0 deletions

diff --git a/linden/indra/llcharacter/llkeyframemotionparam.cpp b/linden/indra/llcharacter/llkeyframemotionparam.cpp
index 5970909..d24b8a6 100644
--- a/linden/indra/llcharacter/llkeyframemotionparam.cpp
+++ b/linden/indra/llcharacter/llkeyframemotionparam.cpp
@@ -187,6 +187,12 @@ BOOL LLKeyframeMotionParam::onUpdate(F32 time, U8* joint_mask)
                 ParameterizedMotion* firstMotion = NULL;
                 ParameterizedMotion* secondMotion = NULL;
 
+                if (NULL == paramValue) // unexpected, but...
+                {
+                        llwarns << "paramValue == NULL" << llendl;
+                        continue;
+                }
+
                 for (ParameterizedMotion* paramMotion = motionList->getFirstData(); paramMotion; paramMotion = motionList->getNextData())
                 {
                         paramMotion->first->onUpdate(time, joint_mask);