diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-11-18 15:55:53 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-11-18 15:55:53 -0800 |
| commit | 424786d8d05093abd816a3decd86aace64816179 (patch) | |
| tree | 689b5bb532202c448fa9221d12aacfd482a0b14c /indra/newview/llviewerobject.cpp | |
| parent | 807007649a32c5276f31c5f73d6fade7d059ce07 (diff) | |
Added viewer-side "object overlaps parcel" check encroachment returnabilty UI
Reviewed with Falcon
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 1804fac1b3..64892c7ee1 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -516,20 +516,12 @@ void LLViewerObject::setNameValueList(const std::string& name_value_list) // This method returns true if the object is over land owned by the // agent. -BOOL LLViewerObject::isOverAgentOwnedLand() const +bool LLViewerObject::isReturnable() { - return mRegionp - && mRegionp->getParcelOverlay() - && mRegionp->getParcelOverlay()->isOwnedSelf(getPositionRegion()); -} - -// This method returns true if the object is over land owned by the -// agent. -BOOL LLViewerObject::isOverGroupOwnedLand() const -{ - return mRegionp - && mRegionp->getParcelOverlay() - && mRegionp->getParcelOverlay()->isOwnedGroup(getPositionRegion()); + LLBBox(getPositionRegion(), getRotationRegion(), getScale() * -0.5f, getScale() * 0.5f); + return !isAttachment() + && mRegionp + && mRegionp->objectIsReturnable(getPositionRegion(), getBoundingBoxRegion()); } BOOL LLViewerObject::setParent(LLViewerObject* parent) |