diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-12-05 15:20:27 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-12-05 15:20:27 -0500 |
| commit | c21571474c0022f83a4efc28d59e97fc020fd0e7 (patch) | |
| tree | 15586cbd2055a1c84dad4ce2f74efe1a885d997d /indra/newview/llviewerobject.cpp | |
| parent | fd2ccb16068dfd21307b17e78e384d8ae19fef12 (diff) | |
| parent | 68413474c4479eee9bdbeb34ea131475ba1d646e (diff) | |
merge changes for 5.0.0-release
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 7964bf1848..4da26404e5 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -371,7 +371,7 @@ void LLViewerObject::markDead() if (av && LLVOAvatar::getRiggedMeshID(this,mesh_id)) { // This case is needed for indirectly attached mesh objects. - av->resetJointPositionsOnDetach(mesh_id); + av->resetJointsOnDetach(mesh_id); } // Mark itself as dead |