diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-09-23 16:16:52 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-09-23 16:16:52 -0600 |
| commit | accb815c9da96a92d1c3d88bdfc7585128a40da8 (patch) | |
| tree | 914b2cd28e37bf09dc926f37f54455089cf4a84a /indra/newview | |
| parent | 9961df7c19ed11566b2153df18773f86032f185c (diff) | |
| parent | 3db2af5d425051cb9b66c3e0bd734895b78aca4b (diff) | |
Automated merge with http://bitbucket.org/seraph/viewer-development-shining
Diffstat (limited to 'indra/newview')
| -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 05695193a5..9bb9b71b19 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; |