diff options
Diffstat (limited to 'linden/indra/newview/llviewerregion.h')
-rw-r--r-- | linden/indra/newview/llviewerregion.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/linden/indra/newview/llviewerregion.h b/linden/indra/newview/llviewerregion.h index 8ac5de2..6407f0c 100644 --- a/linden/indra/newview/llviewerregion.h +++ b/linden/indra/newview/llviewerregion.h | |||
@@ -83,13 +83,14 @@ public: | |||
83 | void setOriginGlobal(const LLVector3d &origin); | 83 | void setOriginGlobal(const LLVector3d &origin); |
84 | void setAgentOffset(const LLVector3d &offset); | 84 | void setAgentOffset(const LLVector3d &offset); |
85 | 85 | ||
86 | void setAllowDamage(BOOL b); | 86 | void setAllowDamage(BOOL b) { setFlags(b, REGION_FLAGS_ALLOW_DAMAGE); } |
87 | void setAllowLandmark(BOOL b); | 87 | void setAllowLandmark(BOOL b) { setFlags(b, REGION_FLAGS_ALLOW_LANDMARK); } |
88 | void setAllowSetHome(BOOL b); | 88 | void setAllowSetHome(BOOL b) { setFlags(b, REGION_FLAGS_ALLOW_SET_HOME); } |
89 | void setResetHomeOnTeleport(BOOL b); | 89 | void setResetHomeOnTeleport(BOOL b) { setFlags(b, REGION_FLAGS_RESET_HOME_ON_TELEPORT); } |
90 | void setSunFixed(BOOL b); | 90 | void setSunFixed(BOOL b) { setFlags(b, REGION_FLAGS_SUN_FIXED); } |
91 | void setBlockFly(BOOL b); | 91 | void setBlockFly(BOOL b) { setFlags(b, REGION_FLAGS_BLOCK_FLY); } |
92 | void setAllowDirectTeleport(BOOL b); | 92 | void setAllowDirectTeleport(BOOL b) { setFlags(b, REGION_FLAGS_ALLOW_DIRECT_TELEPORT); } |
93 | |||
93 | 94 | ||
94 | inline BOOL getAllowDamage() const; | 95 | inline BOOL getAllowDamage() const; |
95 | inline BOOL getAllowLandmark() const; | 96 | inline BOOL getAllowLandmark() const; |
@@ -248,6 +249,7 @@ public: | |||
248 | protected: | 249 | protected: |
249 | void disconnectAllNeighbors(); | 250 | void disconnectAllNeighbors(); |
250 | void initStats(); | 251 | void initStats(); |
252 | void setFlags(BOOL b, U32 flags); | ||
251 | 253 | ||
252 | public: | 254 | public: |
253 | LLWind mWind; | 255 | LLWind mWind; |