diff options
author | prep <none@none> | 2012-03-21 09:53:59 -0400 |
---|---|---|
committer | prep <none@none> | 2012-03-21 09:53:59 -0400 |
commit | e94a38f0c99fbbf315c4fba1ce32edbe5f4bf7ed (patch) | |
tree | 8a547595fcd69d8cfab20bd091922d06536c16d3 /indra/newview/llviewermessage.cpp | |
parent | 154e569923d0caf99fb0d24af8475731f5ceaf33 (diff) | |
parent | bb0f2d3784e3b14e673c893e95072bca5c54848c (diff) |
merge
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rwxr-xr-x | indra/newview/llviewermessage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 05f1be5de5..92c665d9c1 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4735,7 +4735,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data) LLViewerObject* object = gObjectList.findObject(object_id); if (object) { - object->setFlags(FLAGS_ANIM_SOURCE, TRUE); + object->setFlagsWithoutUpdate(FLAGS_ANIM_SOURCE, TRUE); BOOL anim_found = FALSE; LLVOAvatar::AnimSourceIterator anim_it = avatarp->mAnimationSources.find(object_id); @@ -4882,7 +4882,7 @@ void process_set_follow_cam_properties(LLMessageSystem *mesgsys, void **user_dat LLViewerObject* objectp = gObjectList.findObject(source_id); if (objectp) { - objectp->setFlags(FLAGS_CAMERA_SOURCE, TRUE); + objectp->setFlagsWithoutUpdate(FLAGS_CAMERA_SOURCE, TRUE); } S32 num_objects = mesgsys->getNumberOfBlocks("CameraProperty"); |