summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llstatemachine.cpp
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-02-01 13:10:45 +0200
committerMike Antipov <mantipov@productengine.com>2010-02-01 13:10:45 +0200
commitb3641c35fe00ea93887ea8980bf69624c8299267 (patch)
tree9b575e425986b3f0496192e95009ba2297158de3 /indra/llcharacter/llstatemachine.cpp
parent2e2d65cd10a9b2664d3ce020ef7e7e4de3d6705a (diff)
parent244bef7d0cdb75f011f70d8cd834154eeb469088 (diff)
Merge with default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/llcharacter/llstatemachine.cpp')
-rw-r--r--indra/llcharacter/llstatemachine.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcharacter/llstatemachine.cpp b/indra/llcharacter/llstatemachine.cpp
index 73c6951211..e6fa4d7985 100644
--- a/indra/llcharacter/llstatemachine.cpp
+++ b/indra/llcharacter/llstatemachine.cpp
@@ -54,6 +54,7 @@ bool operator!=(const LLUniqueID &a, const LLUniqueID &b)
//-----------------------------------------------------------------------------
LLStateDiagram::LLStateDiagram()
{
+ mDefaultState = NULL;
mUseDefaultState = FALSE;
}
@@ -305,6 +306,7 @@ LLStateMachine::LLStateMachine()
// we haven't received a starting state yet
mCurrentState = NULL;
mLastState = NULL;
+ mLastTransition = NULL;
mStateDiagram = NULL;
}