diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-11-05 16:45:18 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-11-05 16:45:18 -0700 |
| commit | d1c365e7b79c91a51b847535d8df0d804af5ae70 (patch) | |
| tree | 786ada896c585004d9e94c2171f13fd808009441 /indra/newview/llviewerobjectlist.cpp | |
| parent | 169fe36f69e3be6104af980ed005af5b77909e90 (diff) | |
| parent | 124a59263184391b0b4ec418c532b7a715e9b5a3 (diff) | |
Merge latest lindenlab/viewer-development with mani_linden/viewer-development.
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; |