diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-06 15:47:35 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-06 15:47:35 -0800 |
| commit | dd8e387d66bec042bde299b88bab81d465bf4df1 (patch) | |
| tree | e61e85496a17db29acd6682e90410f6dede6f4a2 /indra | |
| parent | c320b2cef916cc8f0e42f041c29c04bf55d40d77 (diff) | |
ER-343 viewer UI does not correctly enable/disable object return
The problem: a misunderstanding of what LLViewerParcelOverlay::isOwned() means.
Diffstat (limited to 'indra')
| -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 e693fc65ea..8508b1847b 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)) ); } |