aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs86
1 files changed, 27 insertions, 59 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index ac28cee..fd08721 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -1518,42 +1518,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
1518 1518
1519 public void sendRegionHandshake(IClientAPI remoteClient) 1519 public void sendRegionHandshake(IClientAPI remoteClient)
1520 { 1520 {
1521 RegionHandshakeArgs args = new RegionHandshakeArgs(); 1521 remoteClient.SendRegionHandshake();
1522
1523 args.isEstateManager = Scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(remoteClient.AgentId);
1524 if (Scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero && Scene.RegionInfo.EstateSettings.EstateOwner == remoteClient.AgentId)
1525 args.isEstateManager = true;
1526
1527 args.billableFactor = Scene.RegionInfo.EstateSettings.BillableFactor;
1528 args.terrainStartHeight0 = (float)Scene.RegionInfo.RegionSettings.Elevation1SW;
1529 args.terrainHeightRange0 = (float)Scene.RegionInfo.RegionSettings.Elevation2SW;
1530 args.terrainStartHeight1 = (float)Scene.RegionInfo.RegionSettings.Elevation1NW;
1531 args.terrainHeightRange1 = (float)Scene.RegionInfo.RegionSettings.Elevation2NW;
1532 args.terrainStartHeight2 = (float)Scene.RegionInfo.RegionSettings.Elevation1SE;
1533 args.terrainHeightRange2 = (float)Scene.RegionInfo.RegionSettings.Elevation2SE;
1534 args.terrainStartHeight3 = (float)Scene.RegionInfo.RegionSettings.Elevation1NE;
1535 args.terrainHeightRange3 = (float)Scene.RegionInfo.RegionSettings.Elevation2NE;
1536 args.simAccess = Scene.RegionInfo.AccessLevel;
1537 args.waterHeight = (float)Scene.RegionInfo.RegionSettings.WaterHeight;
1538 args.regionFlags = GetRegionFlags();
1539 args.regionName = Scene.RegionInfo.RegionName;
1540 args.SimOwner = Scene.RegionInfo.EstateSettings.EstateOwner;
1541
1542 args.terrainBase0 = UUID.Zero;
1543 args.terrainBase1 = UUID.Zero;
1544 args.terrainBase2 = UUID.Zero;
1545 args.terrainBase3 = UUID.Zero;
1546 args.terrainDetail0 = Scene.RegionInfo.RegionSettings.TerrainTexture1;
1547 args.terrainDetail1 = Scene.RegionInfo.RegionSettings.TerrainTexture2;
1548 args.terrainDetail2 = Scene.RegionInfo.RegionSettings.TerrainTexture3;
1549 args.terrainDetail3 = Scene.RegionInfo.RegionSettings.TerrainTexture4;
1550
1551// m_log.DebugFormat("[ESTATE MANAGEMENT MODULE]: Sending terrain texture 1 {0} for region {1}", args.terrainDetail0, Scene.RegionInfo.RegionName);
1552// m_log.DebugFormat("[ESTATE MANAGEMENT MODULE]: Sending terrain texture 2 {0} for region {1}", args.terrainDetail1, Scene.RegionInfo.RegionName);
1553// m_log.DebugFormat("[ESTATE MANAGEMENT MODULE]: Sending terrain texture 3 {0} for region {1}", args.terrainDetail2, Scene.RegionInfo.RegionName);
1554// m_log.DebugFormat("[ESTATE MANAGEMENT MODULE]: Sending terrain texture 4 {0} for region {1}", args.terrainDetail3, Scene.RegionInfo.RegionName);
1555
1556 remoteClient.SendRegionHandshake(Scene.RegionInfo,args);
1557 } 1522 }
1558 1523
1559 public void handleEstateChangeInfo(IClientAPI remoteClient, UUID invoice, UUID senderID, UInt32 parms1, UInt32 parms2) 1524 public void handleEstateChangeInfo(IClientAPI remoteClient, UUID invoice, UUID senderID, UInt32 parms1, UInt32 parms2)
@@ -1673,7 +1638,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
1673 client.OnRegionInfoRequest += HandleRegionInfoRequest; 1638 client.OnRegionInfoRequest += HandleRegionInfoRequest;
1674 client.OnEstateCovenantRequest += HandleEstateCovenantRequest; 1639 client.OnEstateCovenantRequest += HandleEstateCovenantRequest;
1675 client.OnLandStatRequest += HandleLandStatRequest; 1640 client.OnLandStatRequest += HandleLandStatRequest;
1676 sendRegionHandshake(client);
1677 } 1641 }
1678 1642
1679 1643
@@ -1681,39 +1645,43 @@ namespace OpenSim.Region.CoreModules.World.Estate
1681 { 1645 {
1682 RegionFlags flags = RegionFlags.None; 1646 RegionFlags flags = RegionFlags.None;
1683 1647
1648 if (Scene.RegionInfo.EstateSettings.AllowLandmark)
1649 flags |= RegionFlags.AllowLandmark;
1650 if (Scene.RegionInfo.EstateSettings.AllowSetHome)
1651 flags |= RegionFlags.AllowSetHome;
1652 if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport)
1653 flags |= RegionFlags.ResetHomeOnTeleport;
1684 if (Scene.RegionInfo.EstateSettings.FixedSun) 1654 if (Scene.RegionInfo.EstateSettings.FixedSun)
1685 flags |= RegionFlags.SunFixed; 1655 flags |= RegionFlags.SunFixed;
1686 if (Scene.RegionInfo.EstateSettings.PublicAccess) 1656 if (Scene.RegionInfo.EstateSettings.TaxFree) // this is now wrong means ALLOW_ACCESS_OVERRIDE
1687 flags |= (RegionFlags.PublicAllowed | 1657 flags |= RegionFlags.TaxFree;
1688 RegionFlags.ExternallyVisible); 1658
1689 if (Scene.RegionInfo.EstateSettings.AllowVoice) 1659 if (Scene.RegionInfo.EstateSettings.PublicAccess) //??
1690 flags |= RegionFlags.AllowVoice; 1660 flags |= (RegionFlags.PublicAllowed | RegionFlags.ExternallyVisible);
1661
1662 if (Scene.RegionInfo.EstateSettings.BlockDwell)
1663 flags |= RegionFlags.BlockDwell;
1691 if (Scene.RegionInfo.EstateSettings.AllowDirectTeleport) 1664 if (Scene.RegionInfo.EstateSettings.AllowDirectTeleport)
1692 flags |= RegionFlags.AllowDirectTeleport; 1665 flags |= RegionFlags.AllowDirectTeleport;
1666 if (Scene.RegionInfo.EstateSettings.EstateSkipScripts)
1667 flags |= RegionFlags.EstateSkipScripts;
1668
1693 if (Scene.RegionInfo.EstateSettings.DenyAnonymous) 1669 if (Scene.RegionInfo.EstateSettings.DenyAnonymous)
1694 flags |= RegionFlags.DenyAnonymous; 1670 flags |= RegionFlags.DenyAnonymous;
1695 if (Scene.RegionInfo.EstateSettings.DenyIdentified) 1671 if (Scene.RegionInfo.EstateSettings.DenyIdentified) // unused?
1696 flags |= RegionFlags.DenyIdentified; 1672 flags |= RegionFlags.DenyIdentified;
1697 if (Scene.RegionInfo.EstateSettings.DenyTransacted) 1673 if (Scene.RegionInfo.EstateSettings.DenyTransacted) // unused?
1698 flags |= RegionFlags.DenyTransacted; 1674 flags |= RegionFlags.DenyTransacted;
1699 if (Scene.RegionInfo.EstateSettings.AbuseEmailToEstateOwner)
1700 flags |= RegionFlags.AbuseEmailToEstateOwner;
1701 if (Scene.RegionInfo.EstateSettings.BlockDwell)
1702 flags |= RegionFlags.BlockDwell;
1703 if (Scene.RegionInfo.EstateSettings.EstateSkipScripts)
1704 flags |= RegionFlags.EstateSkipScripts;
1705 if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport)
1706 flags |= RegionFlags.ResetHomeOnTeleport;
1707 if (Scene.RegionInfo.EstateSettings.TaxFree)
1708 flags |= RegionFlags.TaxFree;
1709 if (Scene.RegionInfo.EstateSettings.AllowLandmark)
1710 flags |= RegionFlags.AllowLandmark;
1711 if (Scene.RegionInfo.EstateSettings.AllowParcelChanges) 1675 if (Scene.RegionInfo.EstateSettings.AllowParcelChanges)
1712 flags |= RegionFlags.AllowParcelChanges; 1676 flags |= RegionFlags.AllowParcelChanges;
1713 if (Scene.RegionInfo.EstateSettings.AllowSetHome) 1677 if (Scene.RegionInfo.EstateSettings.AbuseEmailToEstateOwner) // now is block fly
1714 flags |= RegionFlags.AllowSetHome; 1678 flags |= RegionFlags.AbuseEmailToEstateOwner;
1679 if (Scene.RegionInfo.EstateSettings.AllowVoice)
1680 flags |= RegionFlags.AllowVoice;
1681
1682
1715 if (Scene.RegionInfo.EstateSettings.DenyMinors) 1683 if (Scene.RegionInfo.EstateSettings.DenyMinors)
1716 flags |= (RegionFlags)(1 << 30); 1684 flags |= RegionFlags.DenyAgeUnverified;
1717 1685
1718 return (uint)flags; 1686 return (uint)flags;
1719 } 1687 }