diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-04 11:20:29 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-04 11:20:29 -0400 |
| commit | d3e71fdc2c35ab75ebdac573698bbb86bbd0d98f (patch) | |
| tree | 78b255dbe76bdaa81f9f4b6abd09f4b8656311d0 /indra/newview/llviewerobjectlist.cpp | |
| parent | cafefd3f5f161d79ecd62bc00b769e6b2b94dc82 (diff) | |
| parent | accb815c9da96a92d1c3d88bdfc7585128a40da8 (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 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; |