aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-10 02:06:34 +0000
committerMelanie Thielker2008-10-10 02:06:34 +0000
commit5c5a640ababeff6d833fec26b87a61ece6500f04 (patch)
treeb9ea52e2d57712dcf754f7793f1681c6f6e939dd
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
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs7
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs13
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
5 files changed, 17 insertions, 9 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index f091994..5bf0d19 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -697,7 +697,7 @@ namespace OpenSim.Framework
697 697
698 void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args); 698 void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args);
699 void SendEstateCovenantInformation(UUID covenant); 699 void SendEstateCovenantInformation(UUID covenant);
700 void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail); 700 void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner);
701 701
702 void SendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags); 702 void SendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags);
703 void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID); 703 void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID);
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index b1f4d7c..563d83b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2834,7 +2834,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2834 this.OutPacket(einfopack, ThrottleOutPacketType.Task); 2834 this.OutPacket(einfopack, ThrottleOutPacketType.Task);
2835 } 2835 }
2836 2836
2837 public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail) 2837 public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner)
2838 { 2838 {
2839 EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); 2839 EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
2840 packet.MethodData.Invoice = invoice; 2840 packet.MethodData.Invoice = invoice;
@@ -2851,10 +2851,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2851 returnblock[0].Parameter = Utils.StringToBytes(estateName); 2851 returnblock[0].Parameter = Utils.StringToBytes(estateName);
2852 // TODO: remove this cruft once MasterAvatar is fully deprecated 2852 // TODO: remove this cruft once MasterAvatar is fully deprecated
2853 // 2853 //
2854 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) 2854 returnblock[1].Parameter = Utils.StringToBytes(estateOwner.ToString());
2855 returnblock[1].Parameter = Utils.StringToBytes(m_scene.RegionInfo.EstateSettings.EstateOwner.ToString());
2856 else
2857 returnblock[1].Parameter = Utils.StringToBytes(m_scene.RegionInfo.MasterAvatarAssignedUUID.ToString());
2858 returnblock[2].Parameter = Utils.StringToBytes(estateID.ToString()); 2855 returnblock[2].Parameter = Utils.StringToBytes(estateID.ToString());
2859 2856
2860 returnblock[3].Parameter = Utils.StringToBytes(estateFlags.ToString()); 2857 returnblock[3].Parameter = Utils.StringToBytes(estateFlags.ToString());
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
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 87478c7..46c6425 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -811,7 +811,7 @@ namespace OpenSim.Region.Examples.SimpleModule
811 public void SendEstateCovenantInformation(UUID covenant) 811 public void SendEstateCovenantInformation(UUID covenant)
812 { 812 {
813 } 813 }
814 public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail) 814 public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner)
815 { 815 {
816 } 816 }
817 817