diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-13 18:05:56 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-13 18:05:56 -0500 |
| commit | b93a23aa828a2ee6de206fe3c74d1b0f3e116db1 (patch) | |
| tree | ffb3a93a482d9f7fc5b69c6f5a542f09ee09cee0 /indra/newview/llvoavatar.cpp | |
| parent | 184d5ee79d4f4b56cd042ded16c6546fa46de611 (diff) | |
MAINT-1147 Fix for frame stall on region crossing.
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 414ddc0c24..73c57adedd 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -1370,8 +1370,6 @@ void LLVOAvatar::onShift(const LLVector4a& shift_vector) const LLVector3& shift = reinterpret_cast<const LLVector3&>(shift_vector); mLastAnimExtents[0] += shift; mLastAnimExtents[1] += shift; - mNeedsImpostorUpdate = TRUE; - mNeedsAnimUpdate = TRUE; } void LLVOAvatar::updateSpatialExtents(LLVector4a& newMin, LLVector4a &newMax) @@ -5066,9 +5064,9 @@ LLJoint *LLVOAvatar::getJoint( const std::string &name ) LLJoint* jointp = NULL; - if (iter == mJointMap.end()) + if (iter == mJointMap.end() || iter->second == NULL) { //search for joint and cache found joint in lookup table - LLJoint* jointp = mRoot.findJoint(name); + jointp = mRoot.findJoint(name); mJointMap[name] = jointp; } else |