diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-10 14:28:54 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-10 14:28:54 -0800 |
| commit | 7eed962a6237f74ec980e06d53886259ef225c55 (patch) | |
| tree | 6f90cd7736c74164f5cfaff071ecfc9f63b7a46f /indra/newview/llviewerobjectlist.cpp | |
| parent | b2e84d739b4f5c00b497e57e892fc10d78af8b76 (diff) | |
| parent | 9d33a548b636fa739de2aa11ba9ed02b301c53a5 (diff) | |
Merge
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; |