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.h | |
| parent | 807007649a32c5276f31c5f73d6fade7d059ce07 (diff) | |
Added viewer-side "object overlaps parcel" check encroachment returnabilty UI
Reviewed with Falcon
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index fe670f8827..21de5d28be 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -226,12 +226,9 @@ public: virtual BOOL hasLightTexture() const { return FALSE; } // This method returns true if the object is over land owned by - // the agent. - BOOL isOverAgentOwnedLand() const; - - // True if over land owned by group of which the agent is - // either officer or member. - BOOL isOverGroupOwnedLand() const; + // the agent, one of its groups, or it it encroaches and + // anti-encroachment is enabled + bool isReturnable(); /* // This method will scan through this object, and then query the |