summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rw-r--r--indra/newview/llviewerregion.cpp80
1 files changed, 3 insertions, 77 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 7fed7ebe94..223286b1c9 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -301,89 +301,15 @@ void LLViewerRegion::sendReliableMessage()
gMessageSystem->sendReliable(mHost);
}
-
-void LLViewerRegion::setAllowDamage(BOOL b)
-{
- if (b)
- {
- mRegionFlags |= REGION_FLAGS_ALLOW_DAMAGE;
- }
- else
- {
- mRegionFlags &= ~REGION_FLAGS_ALLOW_DAMAGE;
- }
-}
-
-
-void LLViewerRegion::setAllowLandmark(BOOL b)
-{
- if (b)
- {
- mRegionFlags |= REGION_FLAGS_ALLOW_LANDMARK;
- }
- else
- {
- mRegionFlags &= ~REGION_FLAGS_ALLOW_LANDMARK;
- }
-}
-
-void LLViewerRegion::setAllowSetHome(BOOL b)
-{
- if (b)
- {
- mRegionFlags |= REGION_FLAGS_ALLOW_SET_HOME;
- }
- else
- {
- mRegionFlags &= ~REGION_FLAGS_ALLOW_SET_HOME;
- }
-}
-
-void LLViewerRegion::setResetHomeOnTeleport(BOOL b)
-{
- if (b)
- {
- mRegionFlags |= REGION_FLAGS_RESET_HOME_ON_TELEPORT;
- }
- else
- {
- mRegionFlags &= ~REGION_FLAGS_RESET_HOME_ON_TELEPORT;
- }
-}
-
-void LLViewerRegion::setSunFixed(BOOL b)
-{
- if (b)
- {
- mRegionFlags |= REGION_FLAGS_SUN_FIXED;
- }
- else
- {
- mRegionFlags &= ~REGION_FLAGS_SUN_FIXED;
- }
-}
-
-void LLViewerRegion::setBlockFly(BOOL b)
-{
- if (b)
- {
- mRegionFlags |= REGION_FLAGS_BLOCK_FLY;
- }
- else
- {
- mRegionFlags &= ~REGION_FLAGS_BLOCK_FLY;
- }
-}
-
-void LLViewerRegion::setAllowDirectTeleport(BOOL b)
+void LLViewerRegion::setFlags(BOOL b, U32 flags)
{
if (b)
{
- mRegionFlags |= REGION_FLAGS_ALLOW_DIRECT_TELEPORT;
+ mRegionFlags |= flags;
}
else
{
- mRegionFlags &= ~REGION_FLAGS_ALLOW_DIRECT_TELEPORT;
+ mRegionFlags &= ~flags;
}
}