*Fixed a mistake in the EstateManagementModule that messed up the trunk.

4 files changed, 38 insertions, 29 deletions

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index b413c2c3..02ecc1a 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -768,6 +768,7 @@ namespace OpenSim.Framework
         void sendEstateManagersList(LLUUID invoice);
         void sendRegionInfoToEstateMenu();
         void sendEstateCovenantInformation();
+        void sendDetailedEstateData(LLUUID invoice);
 
         byte[] GetThrottlesPacked(float multiplier);
 
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 7ca5050..475788a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2240,6 +2240,39 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 einfopack.Data = edata;
                 this.OutPacket(einfopack, ThrottleOutPacketType.Task);
             }
+
+            public void sendDetailedEstateData(LLUUID invoice)
+            {
+                EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
+                packet.MethodData.Invoice = invoice;
+                packet.AgentData.TransactionID = LLUUID.Random();
+                packet.MethodData.Method = Helpers.StringToField("estateupdateinfo");
+                EstateOwnerMessagePacket.ParamListBlock[] returnblock = new EstateOwnerMessagePacket.ParamListBlock[9];
+
+                for (int i = 0; i < 9; i++)
+                {
+                    returnblock[i] = new EstateOwnerMessagePacket.ParamListBlock();
+                }
+
+                //Sending Estate Settings
+                returnblock[0].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateName);
+                returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarAssignedUUID.ToString());
+                returnblock[2].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateID.ToString());
+
+                // TODO: Resolve Magic numbers here
+                returnblock[3].Parameter = Helpers.StringToField("269516800");
+                returnblock[4].Parameter = Helpers.StringToField("0");
+                returnblock[5].Parameter = Helpers.StringToField("1");
+                returnblock[6].Parameter = Helpers.StringToField(m_scene.RegionInfo.RegionID.ToString());
+                returnblock[7].Parameter = Helpers.StringToField("1160895077");
+                returnblock[8].Parameter = Helpers.StringToField("1");
+
+                packet.ParamList = returnblock;
+                packet.Header.Reliable = false;
+                //System.Console.WriteLine("[ESTATE]: SIM--->" + packet.ToString());
+                this.OutPacket(packet, ThrottleOutPacketType.Task);
+            }
+
         #endregion
         
         #region Helper Methods
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index e0bf11b..e15602a 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -51,35 +51,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
         private void sendDetailedEstateData(IClientAPI remote_client, LLUUID invoice)

         {

 

-            EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();

-            packet.MethodData.Invoice = invoice;

-            packet.AgentData.TransactionID = LLUUID.Random();

-            packet.MethodData.Method = Helpers.StringToField("estateupdateinfo");

-            EstateOwnerMessagePacket.ParamListBlock[] returnblock = new EstateOwnerMessagePacket.ParamListBlock[9];

-

-            for (int i = 0; i < 9; i++)

-            {

-                returnblock[i] = new EstateOwnerMessagePacket.ParamListBlock();

-            }

-

-            //Sending Estate Settings

-            returnblock[0].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateName);

-            returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarAssignedUUID.ToString());

-            returnblock[2].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateID.ToString());

-

-            // TODO: Resolve Magic numbers here

-            returnblock[3].Parameter = Helpers.StringToField("269516800");

-            returnblock[4].Parameter = Helpers.StringToField("0");

-            returnblock[5].Parameter = Helpers.StringToField("1");

-            returnblock[6].Parameter = Helpers.StringToField(m_scene.RegionInfo.RegionID.ToString());

-            returnblock[7].Parameter = Helpers.StringToField("1160895077");

-            returnblock[8].Parameter = Helpers.StringToField("1");

-

-            packet.ParamList = returnblock;

-            packet.Header.Reliable = false;

-            //System.Console.WriteLine("[ESTATE]: SIM--->" + packet.ToString());

-            remote_client.OutPacket(packet, ThrottleOutPacketType.Task);

-

+            remote_client.sendDetailedEstateData(invoice);

             remote_client.sendEstateManagersList(invoice);

 

         }

diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 672e34b..1a8f808 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -642,5 +642,8 @@ namespace OpenSim.Region.Examples.SimpleModule
         public void sendEstateCovenantInformation()
         {
         }
+        public void sendDetailedEstateData(LLUUID invoice)
+        {
+        }
     }
 }