summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llpose.cpp
diff options
context:
space:
mode:
authorBrian McGroarty <soft@lindenlab.com>2008-05-07 17:17:42 +0000
committerBrian McGroarty <soft@lindenlab.com>2008-05-07 17:17:42 +0000
commite1e1212daae33723e7da325f295a5c3a6bb78979 (patch)
tree95139904e71995519db2fc6e056940b2f40e73a3 /indra/llcharacter/llpose.cpp
parent41927004751731d2d0cb74989ded36878292ee4e (diff)
QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated
Diffstat (limited to 'indra/llcharacter/llpose.cpp')
-rw-r--r--indra/llcharacter/llpose.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcharacter/llpose.cpp b/indra/llcharacter/llpose.cpp
index 2120cb223e..c57fbfdc5d 100644
--- a/indra/llcharacter/llpose.cpp
+++ b/indra/llcharacter/llpose.cpp
@@ -188,6 +188,7 @@ LLJointStateBlender::LLJointStateBlender()
{
mJointStates[i] = NULL;
mPriorities[i] = S32_MIN;
+ mAdditiveBlends[i] = FALSE;
}
}
@@ -458,6 +459,7 @@ void LLJointStateBlender::resetCachedJoint()
//-----------------------------------------------------------------------------
LLPoseBlender::LLPoseBlender()
+ : mNextPoseSlot(0)
{
}