diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 74 |
1 files changed, 14 insertions, 60 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index e6e6485..3ded00c 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -68,6 +68,8 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
68 | public event ChangeDelegate OnEstateInfoChange; | 68 | public event ChangeDelegate OnEstateInfoChange; |
69 | public event MessageDelegate OnEstateMessage; | 69 | public event MessageDelegate OnEstateMessage; |
70 | 70 | ||
71 | private int m_delayCount = 0; | ||
72 | |||
71 | #region Region Module interface | 73 | #region Region Module interface |
72 | 74 | ||
73 | public string Name { get { return "EstateManagementModule"; } } | 75 | public string Name { get { return "EstateManagementModule"; } } |
@@ -146,6 +148,10 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
146 | flags |= RegionFlags.AllowParcelChanges; | 148 | flags |= RegionFlags.AllowParcelChanges; |
147 | if (Scene.RegionInfo.RegionSettings.BlockShowInSearch) | 149 | if (Scene.RegionInfo.RegionSettings.BlockShowInSearch) |
148 | flags |= RegionFlags.BlockParcelSearch; | 150 | flags |= RegionFlags.BlockParcelSearch; |
151 | if (Scene.RegionInfo.RegionSettings.GodBlockSearch) | ||
152 | flags |= (RegionFlags)(1 << 11); | ||
153 | if (Scene.RegionInfo.RegionSettings.Casino) | ||
154 | flags |= (RegionFlags)(1 << 10); | ||
149 | 155 | ||
150 | if (Scene.RegionInfo.RegionSettings.FixedSun) | 156 | if (Scene.RegionInfo.RegionSettings.FixedSun) |
151 | flags |= RegionFlags.SunFixed; | 157 | flags |= RegionFlags.SunFixed; |
@@ -198,6 +204,14 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
198 | change(Scene.RegionInfo.RegionID); | 204 | change(Scene.RegionInfo.RegionID); |
199 | } | 205 | } |
200 | 206 | ||
207 | protected void RaiseRegionInfoChange(object sender, ElapsedEventArgs e) | ||
208 | { | ||
209 | ChangeDelegate change = OnRegionInfoChange; | ||
210 | |||
211 | if (change != null) | ||
212 | change(Scene.RegionInfo.RegionID); | ||
213 | } | ||
214 | |||
201 | public void TriggerRegionInfoChange() | 215 | public void TriggerRegionInfoChange() |
202 | { | 216 | { |
203 | m_regionChangeTimer.Stop(); | 217 | m_regionChangeTimer.Stop(); |
@@ -1491,68 +1505,8 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
1491 | sendRegionHandshake(client); | 1505 | sendRegionHandshake(client); |
1492 | } | 1506 | } |
1493 | 1507 | ||
1494 | <<<<<<< HEAD | ||
1495 | private uint GetEstateFlags() | ||
1496 | ======= | ||
1497 | public uint GetRegionFlags() | ||
1498 | { | ||
1499 | RegionFlags flags = RegionFlags.None; | ||
1500 | |||
1501 | // Fully implemented | ||
1502 | // | ||
1503 | if (Scene.RegionInfo.RegionSettings.AllowDamage) | ||
1504 | flags |= RegionFlags.AllowDamage; | ||
1505 | if (Scene.RegionInfo.RegionSettings.BlockTerraform) | ||
1506 | flags |= RegionFlags.BlockTerraform; | ||
1507 | if (!Scene.RegionInfo.RegionSettings.AllowLandResell) | ||
1508 | flags |= RegionFlags.BlockLandResell; | ||
1509 | if (Scene.RegionInfo.RegionSettings.DisableCollisions) | ||
1510 | flags |= RegionFlags.SkipCollisions; | ||
1511 | if (Scene.RegionInfo.RegionSettings.DisableScripts) | ||
1512 | flags |= RegionFlags.SkipScripts; | ||
1513 | if (Scene.RegionInfo.RegionSettings.DisablePhysics) | ||
1514 | flags |= RegionFlags.SkipPhysics; | ||
1515 | if (Scene.RegionInfo.RegionSettings.BlockFly) | ||
1516 | flags |= RegionFlags.NoFly; | ||
1517 | if (Scene.RegionInfo.RegionSettings.RestrictPushing) | ||
1518 | flags |= RegionFlags.RestrictPushObject; | ||
1519 | if (Scene.RegionInfo.RegionSettings.AllowLandJoinDivide) | ||
1520 | flags |= RegionFlags.AllowParcelChanges; | ||
1521 | if (Scene.RegionInfo.RegionSettings.BlockShowInSearch) | ||
1522 | flags |= RegionFlags.BlockParcelSearch; | ||
1523 | if (Scene.RegionInfo.RegionSettings.GodBlockSearch) | ||
1524 | flags |= (RegionFlags)(1 << 11); | ||
1525 | if (Scene.RegionInfo.RegionSettings.Casino) | ||
1526 | flags |= (RegionFlags)(1 << 10); | ||
1527 | |||
1528 | if (Scene.RegionInfo.RegionSettings.FixedSun) | ||
1529 | flags |= RegionFlags.SunFixed; | ||
1530 | if (Scene.RegionInfo.RegionSettings.Sandbox) | ||
1531 | flags |= RegionFlags.Sandbox; | ||
1532 | if (Scene.RegionInfo.EstateSettings.AllowVoice) | ||
1533 | flags |= RegionFlags.AllowVoice; | ||
1534 | if (Scene.RegionInfo.EstateSettings.AllowLandmark) | ||
1535 | flags |= RegionFlags.AllowLandmark; | ||
1536 | if (Scene.RegionInfo.EstateSettings.AllowSetHome) | ||
1537 | flags |= RegionFlags.AllowSetHome; | ||
1538 | if (Scene.RegionInfo.EstateSettings.BlockDwell) | ||
1539 | flags |= RegionFlags.BlockDwell; | ||
1540 | if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport) | ||
1541 | flags |= RegionFlags.ResetHomeOnTeleport; | ||
1542 | |||
1543 | |||
1544 | // TODO: SkipUpdateInterestList | ||
1545 | |||
1546 | // Omitted | ||
1547 | // | ||
1548 | // Omitted: NullLayer (what is that?) | ||
1549 | // Omitted: SkipAgentAction (what does it do?) | ||
1550 | |||
1551 | return (uint)flags; | ||
1552 | } | ||
1553 | 1508 | ||
1554 | public uint GetEstateFlags() | 1509 | public uint GetEstateFlags() |
1555 | >>>>>>> avn/ubitvar | ||
1556 | { | 1510 | { |
1557 | RegionFlags flags = RegionFlags.None; | 1511 | RegionFlags flags = RegionFlags.None; |
1558 | 1512 | ||