diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-27 16:19:18 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-27 16:19:18 -0400 |
| commit | 639bb11eefaa82e2875be99fc2222162fe45e437 (patch) | |
| tree | 85300dcdb3b5ef6d365359190ccf5e00c59377cd /indra/newview/llviewerobjectlist.cpp | |
| parent | 158e647247f67344a5d7a9dde6ccc80bad615c9a (diff) | |
| parent | 8d4dd1bcb9184093df807af12364f499c1f5fccf (diff) | |
Automated merge from viewer-development-shining
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index b597e6148e..f9bf0543c4 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -165,6 +165,11 @@ BOOL LLViewerObjectList::removeFromLocalIDTable(const LLViewerObject &object) { U32 local_id = object.mLocalID; LLHost region_host = object.getRegion()->getHost(); + if(!region_host.isOk()) + { + return FALSE ; + } + U32 ip = region_host.getAddress(); U32 port = region_host.getPort(); U64 ipport = (((U64)ip) << 32) | (U64)port; |