From 553a1a3b59b85fe792173c5d728e3950d59bb315 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 10 Dec 2010 21:00:58 -0800 Subject: 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. --- indra/newview/llviewerregion.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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)) ); } -- cgit v1.2.3