diff options
author | Palmer <palmer@lindenlab.com> | 2009-10-28 15:53:29 -0700 |
---|---|---|
committer | Palmer <palmer@lindenlab.com> | 2009-10-28 15:53:29 -0700 |
commit | 0be38781829650a4baa2d22faa5feb88242fdfdc (patch) | |
tree | 14ae1a583ccbc9b774cd4ddf84a8242d8b75a7bc /indra | |
parent | 74e70f2f23901d524350252519beaef8ed6d42e5 (diff) |
EXT-1930 - Crash after failed region crossing then teleport. Null pointer accessed.
Reviewed by Nyx
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llvoavatar.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index a402aff8ab..f9c95afc31 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6400,6 +6400,11 @@ LLBBox LLVOAvatar::getHUDBBox() const ++attachment_iter) { const LLViewerObject* attached_object = (*attachment_iter); + if (attached_object == NULL) + { + llwarns << "HUD attached object is NULL!" << llendl; + continue; + } // initialize bounding box to contain identity orientation and center point for attached object bbox.addPointLocal(attached_object->getPosition()); // add rotated bounding box for attached object |