aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/EstateSettings.cs6
-rw-r--r--OpenSim/Region/Environment/EstateManager.cs11
2 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 8bf3639..f27c1c3 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -547,7 +547,7 @@ namespace OpenSim.Framework
547 // Clear the rest of them.. as they're no longer valid 547 // Clear the rest of them.. as they're no longer valid
548 for (int j = i; j < 10; j++) 548 for (int j = i; j < 10; j++)
549 { 549 {
550 switch (i) 550 switch (j)
551 { 551 {
552 case 0: 552 case 0:
553 m_estateManager0 = LLUUID.Zero; 553 m_estateManager0 = LLUUID.Zero;
@@ -757,10 +757,10 @@ namespace OpenSim.Framework
757 { 757 {
758 configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, 758 configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty,
759 "0.0", true); 759 "0.0", true);
760 configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, String.Empty, "0", 760 configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, String.Empty, "100",
761 true); 761 true);
762 configMember.addConfigurationOption("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 762 configMember.addConfigurationOption("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
763 String.Empty, "0", true); 763 String.Empty, "1", true);
764 configMember.addConfigurationOption("max_agents", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, String.Empty, "40", 764 configMember.addConfigurationOption("max_agents", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, String.Empty, "40",
765 true); 765 true);
766 766
diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index f097b61..63f2a53 100644
--- a/OpenSim/Region/Environment/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -155,8 +155,8 @@ namespace OpenSim.Region.Environment
155 { 155 {
156 case "getinfo": 156 case "getinfo":
157 157
158 //m_log.Info("[ESTATE]: CLIENT--->" + packet.ToString()); 158 //System.Console.WriteLine("[ESTATE]: CLIENT--->" + packet.ToString());
159 sendRegionInfoPacketToAll(); 159 //sendRegionInfoPacketToAll();
160 if (m_scene.PermissionsMngr.GenericEstatePermission(remote_client.AgentId)) 160 if (m_scene.PermissionsMngr.GenericEstatePermission(remote_client.AgentId))
161 { 161 {
162 sendDetailedEstateData(remote_client, packet); 162 sendDetailedEstateData(remote_client, packet);
@@ -302,7 +302,8 @@ namespace OpenSim.Region.Environment
302 returnblock[8].Parameter = Helpers.StringToField("1"); 302 returnblock[8].Parameter = Helpers.StringToField("1");
303 303
304 packet.ParamList = returnblock; 304 packet.ParamList = returnblock;
305 //m_log.Info("[ESTATE]: SIM--->" + packet.ToString()); 305 packet.Header.Reliable = false;
306 //System.Console.WriteLine("[ESTATE]: SIM--->" + packet.ToString());
306 remote_client.OutPacket(packet, ThrottleOutPacketType.Task); 307 remote_client.OutPacket(packet, ThrottleOutPacketType.Task);
307 308
308 sendEstateManagerList(remote_client, packet); 309 sendEstateManagerList(remote_client, packet);
@@ -330,6 +331,7 @@ namespace OpenSim.Region.Environment
330 returnblock[i] = new EstateOwnerMessagePacket.ParamListBlock(); 331 returnblock[i] = new EstateOwnerMessagePacket.ParamListBlock();
331 } 332 }
332 int j = 0; 333 int j = 0;
334
333 returnblock[j].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateID.ToString()); j++; 335 returnblock[j].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateID.ToString()); j++;
334 returnblock[j].Parameter = Helpers.StringToField(((int)EstateAccessCodex.EstateManagers).ToString()); j++; 336 returnblock[j].Parameter = Helpers.StringToField(((int)EstateAccessCodex.EstateManagers).ToString()); j++;
335 returnblock[j].Parameter = Helpers.StringToField("0"); j++; 337 returnblock[j].Parameter = Helpers.StringToField("0"); j++;
@@ -341,7 +343,8 @@ namespace OpenSim.Region.Environment
341 returnblock[j].Parameter = EstateManagers[i].GetBytes(); j++; 343 returnblock[j].Parameter = EstateManagers[i].GetBytes(); j++;
342 } 344 }
343 packet.ParamList = returnblock; 345 packet.ParamList = returnblock;
344 //m_log.Info("[ESTATE]: SIM--->" + packet.ToString()); 346 packet.Header.Reliable = false;
347 //System.Console.WriteLine("[ESTATE]: SIM--->" + packet.ToString());
345 remote_client.OutPacket(packet, ThrottleOutPacketType.Task); 348 remote_client.OutPacket(packet, ThrottleOutPacketType.Task);
346 } 349 }
347 350