diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-08-11 09:02:16 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-08-11 09:02:16 -0400 |
| commit | f6735af9315ed91a0d28804252c1351c9d4b379f (patch) | |
| tree | 1b1fc36446fd12164f28a0d9b62bd2e89fd1601c /indra/llappearance/llavatarappearance.cpp | |
| parent | 00839eb6350627c6272dea242b85ea24544cea33 (diff) | |
| parent | 470e4b5afc7f0fd516eca9d61b95ff770adf3978 (diff) | |
Automated merge with ssh://bitbucket.org/nat_linden/viewer-no-popup
Diffstat (limited to 'indra/llappearance/llavatarappearance.cpp')
| -rw-r--r-- | indra/llappearance/llavatarappearance.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index e5089f028f..60359ca304 100644 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -1566,9 +1566,10 @@ BOOL LLAvatarAppearance::allocateCollisionVolumes( U32 num ) delete_and_clear_array(mCollisionVolumes); mNumCollisionVolumes = 0; - mCollisionVolumes = new LLAvatarJointCollisionVolume[num]; + mCollisionVolumes = new(std::nothrow) LLAvatarJointCollisionVolume[num]; if (!mCollisionVolumes) { + LL_WARNS() << "Failed to allocate collision volumes" << LL_ENDL; return FALSE; } |