aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authormingchen2008-05-04 19:19:18 +0000
committermingchen2008-05-04 19:19:18 +0000
commitddb3a9bdf8a2726d41b94397ac8455bc07e35c09 (patch)
tree3ed7f8980d7a252919ff68bb293a033a738cab9a
parent*Fixed up EstateManagementModule to the module standard - no more packets all... (diff)
downloadopensim-SC_OLD-ddb3a9bdf8a2726d41b94397ac8455bc07e35c09.zip
opensim-SC_OLD-ddb3a9bdf8a2726d41b94397ac8455bc07e35c09.tar.gz
opensim-SC_OLD-ddb3a9bdf8a2726d41b94397ac8455bc07e35c09.tar.bz2
opensim-SC_OLD-ddb3a9bdf8a2726d41b94397ac8455bc07e35c09.tar.xz
*Fixed a mistake in the EstateManagementModule that messed up the trunk.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/IClientAPI.cs1
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs33
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs30
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs3
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
768 void sendEstateManagersList(LLUUID invoice); 768 void sendEstateManagersList(LLUUID invoice);
769 void sendRegionInfoToEstateMenu(); 769 void sendRegionInfoToEstateMenu();
770 void sendEstateCovenantInformation(); 770 void sendEstateCovenantInformation();
771 void sendDetailedEstateData(LLUUID invoice);
771 772
772 byte[] GetThrottlesPacked(float multiplier); 773 byte[] GetThrottlesPacked(float multiplier);
773 774
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
2240 einfopack.Data = edata; 2240 einfopack.Data = edata;
2241 this.OutPacket(einfopack, ThrottleOutPacketType.Task); 2241 this.OutPacket(einfopack, ThrottleOutPacketType.Task);
2242 } 2242 }
2243
2244 public void sendDetailedEstateData(LLUUID invoice)
2245 {
2246 EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
2247 packet.MethodData.Invoice = invoice;
2248 packet.AgentData.TransactionID = LLUUID.Random();
2249 packet.MethodData.Method = Helpers.StringToField("estateupdateinfo");
2250 EstateOwnerMessagePacket.ParamListBlock[] returnblock = new EstateOwnerMessagePacket.ParamListBlock[9];
2251
2252 for (int i = 0; i < 9; i++)
2253 {
2254 returnblock[i] = new EstateOwnerMessagePacket.ParamListBlock();
2255 }
2256
2257 //Sending Estate Settings
2258 returnblock[0].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateName);
2259 returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarAssignedUUID.ToString());
2260 returnblock[2].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateID.ToString());
2261
2262 // TODO: Resolve Magic numbers here
2263 returnblock[3].Parameter = Helpers.StringToField("269516800");
2264 returnblock[4].Parameter = Helpers.StringToField("0");
2265 returnblock[5].Parameter = Helpers.StringToField("1");
2266 returnblock[6].Parameter = Helpers.StringToField(m_scene.RegionInfo.RegionID.ToString());
2267 returnblock[7].Parameter = Helpers.StringToField("1160895077");
2268 returnblock[8].Parameter = Helpers.StringToField("1");
2269
2270 packet.ParamList = returnblock;
2271 packet.Header.Reliable = false;
2272 //System.Console.WriteLine("[ESTATE]: SIM--->" + packet.ToString());
2273 this.OutPacket(packet, ThrottleOutPacketType.Task);
2274 }
2275
2243 #endregion 2276 #endregion
2244 2277
2245 #region Helper Methods 2278 #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
51 private void sendDetailedEstateData(IClientAPI remote_client, LLUUID invoice) 51 private void sendDetailedEstateData(IClientAPI remote_client, LLUUID invoice)
52 { 52 {
53 53
54 EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); 54 remote_client.sendDetailedEstateData(invoice);
55 packet.MethodData.Invoice = invoice;
56 packet.AgentData.TransactionID = LLUUID.Random();
57 packet.MethodData.Method = Helpers.StringToField("estateupdateinfo");
58 EstateOwnerMessagePacket.ParamListBlock[] returnblock = new EstateOwnerMessagePacket.ParamListBlock[9];
59
60 for (int i = 0; i < 9; i++)
61 {
62 returnblock[i] = new EstateOwnerMessagePacket.ParamListBlock();
63 }
64
65 //Sending Estate Settings
66 returnblock[0].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateName);
67 returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarAssignedUUID.ToString());
68 returnblock[2].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateID.ToString());
69
70 // TODO: Resolve Magic numbers here
71 returnblock[3].Parameter = Helpers.StringToField("269516800");
72 returnblock[4].Parameter = Helpers.StringToField("0");
73 returnblock[5].Parameter = Helpers.StringToField("1");
74 returnblock[6].Parameter = Helpers.StringToField(m_scene.RegionInfo.RegionID.ToString());
75 returnblock[7].Parameter = Helpers.StringToField("1160895077");
76 returnblock[8].Parameter = Helpers.StringToField("1");
77
78 packet.ParamList = returnblock;
79 packet.Header.Reliable = false;
80 //System.Console.WriteLine("[ESTATE]: SIM--->" + packet.ToString());
81 remote_client.OutPacket(packet, ThrottleOutPacketType.Task);
82
83 remote_client.sendEstateManagersList(invoice); 55 remote_client.sendEstateManagersList(invoice);
84 56
85 } 57 }
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
642 public void sendEstateCovenantInformation() 642 public void sendEstateCovenantInformation()
643 { 643 {
644 } 644 }
645 public void sendDetailedEstateData(LLUUID invoice)
646 {
647 }
645 } 648 }
646} 649}