summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2015-07-15 14:59:32 +0300
committerandreykproductengine <akleshchev@productengine.com>2015-07-15 14:59:32 +0300
commite03c133750a09a2e83c49fafb4fb48307fca8a22 (patch)
treed9ae3c8d5fc31cd8a7887a2497be2b8556c5aaa0 /indra/newview/llviewerobject.cpp
parentd43cef4ed5a012593ff31c4ef9c0356edbea5339 (diff)
parent02441157a0d22619ccf2a2ee735c8f5251b54fdb (diff)
Merge from viewer-relese and become version 3.8.2
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rwxr-xr-xindra/newview/llviewerobject.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index b8ed17f382..c521b00372 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.