livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

The problem: a misunderstanding of what LLViewerParcelOverlay::isOwned() means.
meow-7.2.2
Andrew Meadows 2010-12-06 15:47:35 -08:00
parent c320b2cef9
commit dd8e387d66
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llviewerregion.cpp
View File

@ -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)) );
}