diff options
| author | McCabe Maxsted | 2010-09-10 21:12:20 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2010-09-16 21:10:09 -0500 |
| commit | cb60ead2713b837f0fd951c2e57fa0773f3b8c32 (patch) | |
| tree | 28f3701204fdb919a588fb7da5cfdde83ad004e8 /linden | |
| parent | fix Bug #240: Make Outfit crashes the viewer in OpenSim (diff) | |
| download | meta-impy-cb60ead2713b837f0fd951c2e57fa0773f3b8c32.zip meta-impy-cb60ead2713b837f0fd951c2e57fa0773f3b8c32.tar.gz meta-impy-cb60ead2713b837f0fd951c2e57fa0773f3b8c32.tar.bz2 meta-impy-cb60ead2713b837f0fd951c2e57fa0773f3b8c32.tar.xz | |
Fix for crash on bad teleports
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llvoavatar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index 513d43c..c8b26be 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp | |||
| @@ -8401,7 +8401,7 @@ LLBBox LLVOAvatar::getHUDBBox() const | |||
| 8401 | { | 8401 | { |
| 8402 | attachment_map_t::const_iterator curiter = iter++; | 8402 | attachment_map_t::const_iterator curiter = iter++; |
| 8403 | LLViewerJointAttachment* attachment = curiter->second; | 8403 | LLViewerJointAttachment* attachment = curiter->second; |
| 8404 | if (attachment->getIsHUDAttachment() && attachment->getObject()) | 8404 | if (attachment && attachment->getIsHUDAttachment() && attachment->getObject()) |
| 8405 | { | 8405 | { |
| 8406 | LLViewerObject* hud_object = attachment->getObject(); | 8406 | LLViewerObject* hud_object = attachment->getObject(); |
| 8407 | 8407 | ||