diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-28 17:33:29 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-28 17:33:29 -0700 |
| commit | d6a2c5965e6b0b07014e8fc2dbb16edc463e0566 (patch) | |
| tree | 879d891f1c6a743529d7683db3d322541e5d39f5 /indra/newview/llvoavatar.cpp | |
| parent | 5db497e398d537a7f3b23c50336e2825006e0907 (diff) | |
| parent | 437449044583d50c8cad694e65e5a4a23a55d768 (diff) | |
merge from remote repo
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -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 |