diff options
author | Melanie Thielker | 2008-10-10 02:06:34 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-10-10 02:06:34 +0000 |
commit | 5c5a640ababeff6d833fec26b87a61ece6500f04 (patch) | |
tree | b9ea52e2d57712dcf754f7793f1681c6f6e939dd /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
parent | Add the beginnings of a sim health check (through remote admin) (diff) | |
download | opensim-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 '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 7 |
1 files changed, 2 insertions, 5 deletions
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()); |