diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-10 21:00:58 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-10 21:00:58 -0800 |
| commit | 553a1a3b59b85fe792173c5d728e3950d59bb315 (patch) | |
| tree | d43ffc582add064264b601a3d258a517f0ee2c70 | |
| parent | e040f16a4f2e50592a125a04185fd9f06ac49522 (diff) | |
Sigh... another fix for ER-343. Or maybe I forgot to commit the first time?
LLViewerParcelOverlay::isOwned() just reports that *someone* ownes the parcel
rather than the main *avatar* ownes the parcel.
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index c73b5fdd40..d9fd731ad3 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1503,7 +1503,8 @@ 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) + && ( (mParcelOverlay->isOwnedSelf(pos) + || mParcelOverlay->isOwnedGroup(pos)) || ((mRegionFlags & ALLOW_RETURN_ENCROACHING_OBJECT) && mParcelOverlay->encroachesOwned(bbox)) ); } |