Second Life viewer sources 1.15.1.3

1 files changed, 15 insertions, 15 deletions

diff --git a/linden/indra/llcharacter/llstatemachine.cpp b/linden/indra/llcharacter/llstatemachine.cpp
index 1ad81be..d7ecae4 100644
--- a/linden/indra/llcharacter/llstatemachine.cpp
+++ b/linden/indra/llcharacter/llstatemachine.cpp
@@ -362,28 +362,28 @@ void LLStateMachine::processTransition(LLFSMTransition& transition, void* user_d
 {
         llassert(mStateDiagram);
         
+        if (NULL == mCurrentState)
+        {
+                llwarns << "mCurrentState == NULL; aborting processTransition()" << llendl;
+                return;
+        }
+
         LLFSMState* new_state = mStateDiagram->processTransition(*mCurrentState, transition);
 
+        if (NULL == new_state)
+        {
+                llwarns << "new_state == NULL; aborting processTransition()" << llendl;
+                return;
+        }
+
         mLastTransition = &transition;
         mLastState = mCurrentState;
 
         if (*mCurrentState != *new_state)
         {
-                if (mCurrentState && new_state && *mCurrentState != *new_state)
-                {
-                        mCurrentState->onExit(user_data);
-                }
-                if (new_state)
-                {
-                        if (!mCurrentState || *mCurrentState != *new_state)
-                        {
-                                mCurrentState = new_state;
-                                if (mCurrentState)
-                                {
-                                        mCurrentState->onEntry(user_data);
-                                }
-                        }
-                }
+                mCurrentState->onExit(user_data);
+                mCurrentState = new_state;
+                mCurrentState->onEntry(user_data);
 #if FSM_PRINT_STATE_TRANSITIONS
                 llinfos << "Entering state " << mCurrentState->getName() <<
                         " on transition " << transition.getName() << " from state " <<