aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-10 02:06:34 +0000
committerMelanie Thielker2008-10-10 02:06:34 +0000
commit5c5a640ababeff6d833fec26b87a61ece6500f04 (patch)
treeb9ea52e2d57712dcf754f7793f1681c6f6e939dd /OpenSim/Region/Environment
parentAdd the beginnings of a sim health check (through remote admin) (diff)
downloadopensim-SC_OLD-5c5a640ababeff6d833fec26b87a61ece6500f04.zip
opensim-SC_OLD-5c5a640ababeff6d833fec26b87a61ece6500f04.tar.gz
opensim-SC_OLD-5c5a640ababeff6d833fec26b87a61ece6500f04.tar.bz2
opensim-SC_OLD-5c5a640ababeff6d833fec26b87a61ece6500f04.tar.xz
A bit more estate fudging
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs13
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs2
2 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index 7a9dc72..e7e4659 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -52,8 +52,18 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
52 //SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant) 52 //SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant)
53 53
54 uint sun = 0; 54 uint sun = 0;
55
55 if (!m_scene.RegionInfo.EstateSettings.UseGlobalTime) 56 if (!m_scene.RegionInfo.EstateSettings.UseGlobalTime)
56 sun=(uint)(m_scene.RegionInfo.EstateSettings.SunPosition*1024.0) + 0x1800; 57 sun=(uint)(m_scene.RegionInfo.EstateSettings.SunPosition*1024.0) + 0x1800;
58 UUID estateOwner;
59 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
60 estateOwner = m_scene.RegionInfo.EstateSettings.EstateOwner;
61 else
62 estateOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID;
63
64 if (m_scene.ExternalChecks.ExternalChecksCanBeGodLike(remote_client.AgentId))
65 estateOwner = remote_client.AgentId;
66
57 remote_client.SendDetailedEstateData(invoice, 67 remote_client.SendDetailedEstateData(invoice,
58 m_scene.RegionInfo.EstateSettings.EstateName, 68 m_scene.RegionInfo.EstateSettings.EstateName,
59 m_scene.RegionInfo.EstateSettings.EstateID, 69 m_scene.RegionInfo.EstateSettings.EstateID,
@@ -61,7 +71,8 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
61 GetEstateFlags(), 71 GetEstateFlags(),
62 sun, 72 sun,
63 m_scene.RegionInfo.RegionSettings.Covenant, 73 m_scene.RegionInfo.RegionSettings.Covenant,
64 m_scene.RegionInfo.EstateSettings.AbuseEmail); 74 m_scene.RegionInfo.EstateSettings.AbuseEmail,
75 estateOwner);
65 76
66 remote_client.SendEstateManagersList(invoice, 77 remote_client.SendEstateManagersList(invoice,
67 m_scene.RegionInfo.EstateSettings.EstateManagers, 78 m_scene.RegionInfo.EstateSettings.EstateManagers,
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index b59b013..b438709 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -822,7 +822,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
822 public void SendEstateCovenantInformation(UUID covenant) 822 public void SendEstateCovenantInformation(UUID covenant)
823 { 823 {
824 } 824 }
825 public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail) 825 public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner)
826 { 826 {
827 } 827 }
828 828