diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-01-11 09:03:18 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-01-11 09:03:18 -0800 |
| commit | aab5759467a4d24aaebbdc95f052fbcb46826657 (patch) | |
| tree | 461fe115173ff85aa29233093c5334b4658a4000 /indra/newview/llviewerobject.h | |
| parent | 8e3c9b127373bb39c248ae7abf2003e684dbc6ba (diff) | |
| parent | c8457f266423370e6f8e84c1b23ef95ed69a2997 (diff) | |
STORM-807 : pull into viewer-development
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..5c1a34d555 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 encroaches and + // anti-encroachment is enabled + bool isReturnable(); /* // This method will scan through this object, and then query the |