diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-05-01 00:46:50 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-05-01 00:46:50 -0500 |
| commit | ad8fb0e1bb6c242cc84aa3d2cfaabc9ee36e39b6 (patch) | |
| tree | f9a4fe3e89595e9f078d4bcd5a4f37139cfee005 /indra/newview/llviewerobject.cpp | |
| parent | b0fa1e011f14356b3634f39d32f43e244b6f1298 (diff) | |
| parent | f324787a70b8fccc7a8ea202805bf726fba765a7 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 6bd3ceb8a8..3aecd0175d 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -5219,6 +5219,25 @@ void LLViewerObject::resetChildrenPosition(const LLVector3& offset, BOOL simplif return ; } +//virtual +LLVOAvatar* LLViewerObject::getAvatar() const +{ + if (isAttachment()) + { + LLViewerObject* vobj = (LLViewerObject*) getParent(); + + while (vobj && !vobj->asAvatar()) + { + vobj = (LLViewerObject*) vobj->getParent(); + } + + return (LLVOAvatar*) vobj; + } + + return NULL; +} + + class ObjectPhysicsProperties : public LLHTTPNode { public: |