From 7bc0b7b6c18512e122c1f3fb4cc1f5b138bd64b5 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Thu, 3 Apr 2008 22:59:38 +0000
Subject: * Fixes Region/Estate panel in current Linden Official client. * Sets
 the default estate parentID to 1..  which means that all regions are treated
 like private estates in the client as opposed to Linden Mainland. (no space
 server hiccup message).  If that message annoys you and you want to get rid
 of it, set your parentEstateID to 1.

---
 OpenSim/Framework/EstateSettings.cs         |  6 +++---
 OpenSim/Region/Environment/EstateManager.cs | 11 +++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'OpenSim')

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
                 // Clear the rest of them..   as they're no longer valid
                 for (int j = i; j < 10; j++)
                 {
-                    switch (i)
+                    switch (j)
                     {
                         case 0:
                             m_estateManager0 = LLUUID.Zero;
@@ -757,10 +757,10 @@ namespace OpenSim.Framework
         {
             configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty,
                                                 "0.0", true);
-            configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, String.Empty, "0",
+            configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, String.Empty, "100",
                                                 true);
             configMember.addConfigurationOption("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                                                String.Empty, "0", true);
+                                                String.Empty, "1", true);
             configMember.addConfigurationOption("max_agents", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, String.Empty, "40",
                                                 true);
 
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
             {
                 case "getinfo":
 
-                    //m_log.Info("[ESTATE]: CLIENT--->" +  packet.ToString());
-                    sendRegionInfoPacketToAll();
+                    //System.Console.WriteLine("[ESTATE]: CLIENT--->" +  packet.ToString());
+                    //sendRegionInfoPacketToAll();
                     if (m_scene.PermissionsMngr.GenericEstatePermission(remote_client.AgentId))
                     {
                         sendDetailedEstateData(remote_client, packet);
@@ -302,7 +302,8 @@ namespace OpenSim.Region.Environment
             returnblock[8].Parameter = Helpers.StringToField("1");
 
             packet.ParamList = returnblock;
-            //m_log.Info("[ESTATE]: SIM--->" + packet.ToString());
+            packet.Header.Reliable = false;
+            //System.Console.WriteLine("[ESTATE]: SIM--->" + packet.ToString());
             remote_client.OutPacket(packet, ThrottleOutPacketType.Task);
 
             sendEstateManagerList(remote_client, packet);
@@ -330,6 +331,7 @@ namespace OpenSim.Region.Environment
                 returnblock[i] = new EstateOwnerMessagePacket.ParamListBlock();
             }
             int j = 0;
+            
             returnblock[j].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateID.ToString()); j++;
             returnblock[j].Parameter = Helpers.StringToField(((int)EstateAccessCodex.EstateManagers).ToString()); j++;
             returnblock[j].Parameter = Helpers.StringToField("0"); j++;
@@ -341,7 +343,8 @@ namespace OpenSim.Region.Environment
                 returnblock[j].Parameter = EstateManagers[i].GetBytes(); j++;
             }
             packet.ParamList = returnblock;
-            //m_log.Info("[ESTATE]: SIM--->" + packet.ToString());
+            packet.Header.Reliable = false;
+            //System.Console.WriteLine("[ESTATE]: SIM--->" + packet.ToString());
             remote_client.OutPacket(packet, ThrottleOutPacketType.Task);
         }
 
-- 
cgit v1.1