diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-06-27 14:15:42 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-06-27 14:15:42 +0100 |
| commit | b6aedb116f60b9e4823f61b945b3f374d9267c1d (patch) | |
| tree | a6bfc5910dff43d9e4153fb7d91784fcb385d1a9 /indra/newview/llvoavatar.cpp | |
| parent | 3c8ff04c0fa5c891a0454d7542f78f65eb5032dc (diff) | |
SL-722 - in progress on managing animated object state with linksets
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index beb6f08899..c268ab5f3c 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3433,7 +3433,7 @@ void LLVOAvatar::updateDebugText() { LLControlAvatar *control_av = dynamic_cast<LLControlAvatar*>(this); // Try to get name from inventory of associated object - LLVOVolume *volp = control_av->mVolp; + LLVOVolume *volp = control_av->mRootVolp; if (volp) { volp->requestInventory(); // AXON should be a no-op if already requested or fetched? @@ -5565,14 +5565,14 @@ void LLVOAvatar::addAttachmentOverridesForObject(LLViewerObject *vo) { bool non_attached_case = false; // FIXME AXON - will this work if vo has child objects? - if (vo->mControlAvatar) + if (vo->getControlAvatar()) { non_attached_case = true; } LLVOAvatar *av; if (non_attached_case) { - av = vo->mControlAvatar; + av = vo->getControlAvatar(); } else { |