From dd8e387d66bec042bde299b88bab81d465bf4df1 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@lindenlab.com>
Date: Mon, 6 Dec 2010 15:47:35 -0800
Subject: [PATCH] ER-343 viewer UI does not correctly enable/disable object
return The problem: a misunderstanding of what
LLViewerParcelOverlay::isOwned() means.
---
indra/newview/llviewerregion.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index e693fc65ea9..8508b1847ba 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)) );
}
--
GitLab