diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-07-16 14:13:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-07-16 14:13:41 -0400 |
| commit | 4fb66604c9767bf518575963e9d4a871800bdeb3 (patch) | |
| tree | 79efda5c64d821527bc52a1fd2ed5a2ef75cf4d4 /indra/newview/llviewerobject.cpp | |
| parent | 34f53b826ce70c767738e6f4400d33e850e5b6a2 (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 a2c0a91ea6..ac3f07fcd8 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. |