diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2007-07-18 21:22:40 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2007-07-18 21:22:40 +0000 |
| commit | ce7682c2a468e926d6b38e4f95bd289a8d26222c (patch) | |
| tree | 80535a3916676294d640b4ce47c1895d0a27cd1b /indra/newview/llviewerregion.h | |
| parent | e1ab7d8a30cc40cbd1d471c67def21508c82ff49 (diff) | |
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rw-r--r-- | indra/newview/llviewerregion.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index e971efeedf..ec36c0bd0b 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -63,13 +63,14 @@ public: void setOriginGlobal(const LLVector3d &origin); void setAgentOffset(const LLVector3d &offset); - void setAllowDamage(BOOL b); - void setAllowLandmark(BOOL b); - void setAllowSetHome(BOOL b); - void setResetHomeOnTeleport(BOOL b); - void setSunFixed(BOOL b); - void setBlockFly(BOOL b); - void setAllowDirectTeleport(BOOL b); + void setAllowDamage(BOOL b) { setFlags(b, REGION_FLAGS_ALLOW_DAMAGE); } + void setAllowLandmark(BOOL b) { setFlags(b, REGION_FLAGS_ALLOW_LANDMARK); } + void setAllowSetHome(BOOL b) { setFlags(b, REGION_FLAGS_ALLOW_SET_HOME); } + void setResetHomeOnTeleport(BOOL b) { setFlags(b, REGION_FLAGS_RESET_HOME_ON_TELEPORT); } + void setSunFixed(BOOL b) { setFlags(b, REGION_FLAGS_SUN_FIXED); } + void setBlockFly(BOOL b) { setFlags(b, REGION_FLAGS_BLOCK_FLY); } + void setAllowDirectTeleport(BOOL b) { setFlags(b, REGION_FLAGS_ALLOW_DIRECT_TELEPORT); } + inline BOOL getAllowDamage() const; inline BOOL getAllowLandmark() const; @@ -228,6 +229,7 @@ public: protected: void disconnectAllNeighbors(); void initStats(); + void setFlags(BOOL b, U32 flags); public: LLWind mWind; |