diff options
| author | prep <none@none> | 2012-02-29 12:04:09 -0500 |
|---|---|---|
| committer | prep <none@none> | 2012-02-29 12:04:09 -0500 |
| commit | 91fdd33f765b2f1ae7a4608bc426a106c75cfc11 (patch) | |
| tree | fe687ef29b96f5c4cc8e95bcae0bfb455cef50df /indra/newview/llviewermessage.cpp | |
| parent | cfdd0c6faedfb8f93af7059bb61ae6dc8f8a1c69 (diff) | |
| parent | 4d77d3cca1c932516781222e0c8c14d27f876466 (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 3c6770df43..8905efed75 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4715,7 +4715,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data) LLViewerObject* object = gObjectList.findObject(object_id); if (object) { - object->mFlags |= FLAGS_ANIM_SOURCE; + object->setFlags(FLAGS_ANIM_SOURCE, TRUE); BOOL anim_found = FALSE; LLVOAvatar::AnimSourceIterator anim_it = avatarp->mAnimationSources.find(object_id); @@ -4862,7 +4862,7 @@ void process_set_follow_cam_properties(LLMessageSystem *mesgsys, void **user_dat LLViewerObject* objectp = gObjectList.findObject(source_id); if (objectp) { - objectp->mFlags |= FLAGS_CAMERA_SOURCE; + objectp->setFlags(FLAGS_CAMERA_SOURCE, TRUE); } S32 num_objects = mesgsys->getNumberOfBlocks("CameraProperty"); |