diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-15 08:03:49 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-15 08:03:49 -0800 |
| commit | bcc8351eb1389e81cef53998da3de7f9e54957eb (patch) | |
| tree | b556137fa47888644aa2ec43c9cca8b98e6b5c6f | |
| parent | 64512b681e2f5582378d9943642a82c83cae30ac (diff) | |
| parent | dd8e387d66bec042bde299b88bab81d465bf4df1 (diff) | |
merge
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index c73b5fdd40..43b26fe830 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1502,8 +1502,9 @@ const U32 ALLOW_RETURN_ENCROACHING_OBJECT = REGION_FLAGS_ALLOW_RETURN_ENCROACHIN bool LLViewerRegion::objectIsReturnable(const LLVector3& pos, const LLBBox& bbox) { - return mParcelOverlay - && ( mParcelOverlay->isOwned(pos) + return (mParcelOverlay != NULL) + && (mParcelOverlay->isOwnedSelf(pos) + || mParcelOverlay->isOwnedGroup(pos) || ((mRegionFlags & ALLOW_RETURN_ENCROACHING_OBJECT) && mParcelOverlay->encroachesOwned(bbox)) ); } |