Skip to content
Snippets Groups Projects
Commit dd8e387d authored by Andrew Meadows's avatar Andrew Meadows
Browse files

ER-343 viewer UI does not correctly enable/disable object return

The problem: a misunderstanding of what LLViewerParcelOverlay::isOwned() means.
parent c320b2ce
No related branches found
No related tags found
No related merge requests found
...@@ -1502,8 +1502,9 @@ const U32 ALLOW_RETURN_ENCROACHING_OBJECT = REGION_FLAGS_ALLOW_RETURN_ENCROACHIN ...@@ -1502,8 +1502,9 @@ const U32 ALLOW_RETURN_ENCROACHING_OBJECT = REGION_FLAGS_ALLOW_RETURN_ENCROACHIN
bool LLViewerRegion::objectIsReturnable(const LLVector3& pos, const LLBBox& bbox) bool LLViewerRegion::objectIsReturnable(const LLVector3& pos, const LLBBox& bbox)
{ {
return mParcelOverlay return (mParcelOverlay != NULL)
&& ( mParcelOverlay->isOwned(pos) && (mParcelOverlay->isOwnedSelf(pos)
|| mParcelOverlay->isOwnedGroup(pos)
|| ((mRegionFlags & ALLOW_RETURN_ENCROACHING_OBJECT) || ((mRegionFlags & ALLOW_RETURN_ENCROACHING_OBJECT)
&& mParcelOverlay->encroachesOwned(bbox)) ); && mParcelOverlay->encroachesOwned(bbox)) );
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment