diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-07-14 18:54:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-07-14 18:54:37 -0400 |
| commit | f46526b16004e734d0a459e482ab9bb5df656c54 (patch) | |
| tree | 87c1390cc6b001cf1bc4e52c3dab52f152313c11 /indra/newview/llviewerobject.cpp | |
| parent | c2f9c5ac8189b8076d51711c3be09dfbe309e22b (diff) | |
| parent | 02441157a0d22619ccf2a2ee735c8f5251b54fdb (diff) | |
merge changes for 3.8.1-release
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rwxr-xr-x | indra/newview/llviewerobject.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 382f077601..839044a3cc 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -1958,6 +1958,11 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys, if (sent_parentp && (sent_parentp != this) && !sent_parentp->isDead()) { + if (((LLViewerObject*)sent_parentp)->isAvatar()) + { + //LL_DEBUGS("Avatar") << "ATT got object update for attachment " << LL_ENDL; + } + // // We have a viewer object for the parent, and it's not dead. // Do the actual reparenting here. |