diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-15 20:43:17 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-15 20:43:17 +0300 |
| commit | dae67e9f960bf02e3fecb59c7a11a90410054235 (patch) | |
| tree | 11b2f01d56164d444184b8101618e876f18b9c62 /indra/newview/llcontrolavatar.cpp | |
| parent | be7d81626e512019b46a8ed301b4a1825e129aa5 (diff) | |
| parent | 33821bd599d1d9171cc93c38a2bc6c4ab6772c9a (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llcontrolavatar.cpp')
| -rw-r--r-- | indra/newview/llcontrolavatar.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp index d24dac385f..92eeebd705 100644 --- a/indra/newview/llcontrolavatar.cpp +++ b/indra/newview/llcontrolavatar.cpp @@ -327,10 +327,13 @@ LLControlAvatar *LLControlAvatar::createControlAvatar(LLVOVolume *obj) { LLControlAvatar *cav = (LLControlAvatar*)gObjectList.createObjectViewer(LL_PCODE_LEGACY_AVATAR, gAgent.getRegion(), CO_FLAG_CONTROL_AVATAR); - cav->mRootVolp = obj; + if (cav) + { + cav->mRootVolp = obj; - // Sync up position/rotation with object - cav->matchVolumeTransform(); + // Sync up position/rotation with object + cav->matchVolumeTransform(); + } return cav; } |