diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-13 10:28:15 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-13 10:28:15 -0500 |
| commit | 584c7ecb4ed02e9ab039c6254ffc33331c31058c (patch) | |
| tree | 19e34f57dc625da58f03e4eb659b721e38f072a7 /indra/newview/llviewerobject.h | |
| parent | e7f068c37ef18315a11f1054bfd095b3420025aa (diff) | |
| parent | 55322713fc071a3e171fd4cfbea989945dc8d084 (diff) | |
Automated merge up from 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 3ba51a6448..0b6d8483e9 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -228,12 +228,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 |