aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authormingchen2007-07-12 16:19:32 +0000
committermingchen2007-07-12 16:19:32 +0000
commitb27924d0a53e7cf316e3d753d0631b3c221ed887 (patch)
treee75858c45d3f3bfa3185b8812545d83052a4a12c /OpenSim
parentNext time maybe I should check it still compiles before committing. (diff)
downloadopensim-SC-b27924d0a53e7cf316e3d753d0631b3c221ed887.zip
opensim-SC-b27924d0a53e7cf316e3d753d0631b3c221ed887.tar.gz
opensim-SC-b27924d0a53e7cf316e3d753d0631b3c221ed887.tar.bz2
opensim-SC-b27924d0a53e7cf316e3d753d0631b3c221ed887.tar.xz
*Found and fixed bug that crashed viewer when logging in or viewing land owners
*Reenabled estate manager; remember, the master avatar is the only one that can use this (by default: Test User with password 'test') *Still working on readding support for updating parcel information when logging in or moving into a new parcel
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/EstateManager.cs1
-rw-r--r--OpenSim/Region/Environment/ParcelManager.cs10
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs16
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs1
4 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index b5a74ad..de0b040 100644
--- a/OpenSim/Region/Environment/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -71,7 +71,6 @@ namespace OpenSim.Region.Environment
71 switch (Helpers.FieldToUTF8String(packet.MethodData.Method)) 71 switch (Helpers.FieldToUTF8String(packet.MethodData.Method))
72 { 72 {
73 case "getinfo": 73 case "getinfo":
74 Console.WriteLine("GETINFO Requested");
75 this.sendRegionInfoPacketToAll(); 74 this.sendRegionInfoPacketToAll();
76 75
77 break; 76 break;
diff --git a/OpenSim/Region/Environment/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
index 2059b3f..a1ed930 100644
--- a/OpenSim/Region/Environment/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -356,11 +356,11 @@ namespace OpenSim.Region.Environment
356 //Sale Flag 356 //Sale Flag
357 tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_IS_FOR_SALE); 357 tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_IS_FOR_SALE);
358 } 358 }
359 else if (currentParcelBlock.parcelData.ownerID == LLUUID.Zero) 359 /*else if (currentParcelBlock.parcelData.ownerID == LLUUID.Zero)
360 { 360 {
361 //Public Flag 361 //Public Flag
362 tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_PUBLIC); 362 tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_PUBLIC);
363 } 363 }*/
364 else 364 else
365 { 365 {
366 //Other Flag 366 //Other Flag
@@ -395,6 +395,7 @@ namespace OpenSim.Region.Environment
395 packet = new ParcelOverlayPacket(); 395 packet = new ParcelOverlayPacket();
396 packet.ParcelData.Data = byteArray; 396 packet.ParcelData.Data = byteArray;
397 packet.ParcelData.SequenceID = sequenceID; 397 packet.ParcelData.SequenceID = sequenceID;
398 Console.WriteLine("SENT #" + sequenceID);
398 remote_client.OutPacket((Packet)packet); 399 remote_client.OutPacket((Packet)packet);
399 sequenceID++; 400 sequenceID++;
400 byteArray = new byte[PARCEL_BLOCKS_PER_PACKET]; 401 byteArray = new byte[PARCEL_BLOCKS_PER_PACKET];
@@ -402,10 +403,7 @@ namespace OpenSim.Region.Environment
402 } 403 }
403 } 404 }
404 405
405 packet = new ParcelOverlayPacket(); 406
406 packet.ParcelData.Data = byteArray;
407 packet.ParcelData.SequenceID = sequenceID; //Eh?
408 remote_client.OutPacket((Packet)packet);
409 } 407 }
410 408
411 public void handleParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client) 409 public void handleParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client)
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 80c61e1..d526b3c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -487,15 +487,17 @@ namespace OpenSim.Region.Environment.Scenes
487 client.OnLinkObjects += this.LinkObjects; 487 client.OnLinkObjects += this.LinkObjects;
488 client.OnObjectDuplicate += this.DuplicateObject; 488 client.OnObjectDuplicate += this.DuplicateObject;
489 489
490 /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest); 490 client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
491 remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest); 491 client.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
492 remoteClient.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest); 492 client.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest);
493 remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest); 493 client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
494 remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage); 494 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
495 */ 495
496 this.estateManager.sendRegionHandshake(client); 496 this.estateManager.sendRegionHandshake(client);
497
498 CreateAndAddScenePresence(client); 497 CreateAndAddScenePresence(client);
498
499 this.parcelManager.sendParcelOverlay(client);
500
499 return; 501 return;
500 } 502 }
501 503
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index e65ab7c..8134276 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -274,6 +274,7 @@ namespace OpenSim.Region.Environment.Scenes
274 { 274 {
275 movementflag -= (byte)(uint)DCF; 275 movementflag -= (byte)(uint)DCF;
276 update_movementflag = true; 276 update_movementflag = true;
277
277 } 278 }
278 } 279 }
279 i++; 280 i++;