aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTeravus Ovares2008-04-03 22:59:38 +0000
committerTeravus Ovares2008-04-03 22:59:38 +0000
commit7bc0b7b6c18512e122c1f3fb4cc1f5b138bd64b5 (patch)
tree56ca3618518fa8e876d23f1545fe9505580e3ccf /OpenSim/Region
parentmove NullStorage => OpenSim.Data.Null to be consistant with (diff)
downloadopensim-SC_OLD-7bc0b7b6c18512e122c1f3fb4cc1f5b138bd64b5.zip
opensim-SC_OLD-7bc0b7b6c18512e122c1f3fb4cc1f5b138bd64b5.tar.gz
opensim-SC_OLD-7bc0b7b6c18512e122c1f3fb4cc1f5b138bd64b5.tar.bz2
opensim-SC_OLD-7bc0b7b6c18512e122c1f3fb4cc1f5b138bd64b5.tar.xz
* 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.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/EstateManager.cs11
1 files changed, 7 insertions, 4 deletions
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