diff options
Diffstat (limited to 'OpenSim/OpenSim.RegionServer/world/World.cs')
-rw-r--r-- | OpenSim/OpenSim.RegionServer/world/World.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/OpenSim.RegionServer/world/World.cs b/OpenSim/OpenSim.RegionServer/world/World.cs index 559ed6f..0eea039 100644 --- a/OpenSim/OpenSim.RegionServer/world/World.cs +++ b/OpenSim/OpenSim.RegionServer/world/World.cs | |||
@@ -283,9 +283,9 @@ namespace OpenSim.world | |||
283 | //Parcel backup routines. Yay! | 283 | //Parcel backup routines. Yay! |
284 | ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count]; | 284 | ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count]; |
285 | int i; | 285 | int i; |
286 | for(i = 0; i < parcelManager.parcelList.Count; i++) | 286 | for (i = 0; i < parcelManager.parcelList.Count; i++) |
287 | { | 287 | { |
288 | parcels[i] = parcelManager.parcelList[i].parcelData; | 288 | parcels[i] = parcelManager.parcelList[OpenSim.RegionServer.world.ParcelManager.START_PARCEL_LOCAL_ID + i].parcelData; |
289 | } | 289 | } |
290 | localStorage.SaveParcels(parcels); | 290 | localStorage.SaveParcels(parcels); |
291 | 291 | ||
@@ -615,6 +615,7 @@ namespace OpenSim.world | |||
615 | agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject); | 615 | agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject); |
616 | 616 | ||
617 | agentClient.OnParcelPropertiesRequest += new OpenSim.RegionServer.world.ParcelPropertiesRequest(ParcelPropertiesRequest); | 617 | agentClient.OnParcelPropertiesRequest += new OpenSim.RegionServer.world.ParcelPropertiesRequest(ParcelPropertiesRequest); |
618 | agentClient.OnParcelDivideRequest += new OpenSim.RegionServer.world.ParcelDivideRequest(ParcelDivideRequest); | ||
618 | Avatar newAvatar = null; | 619 | Avatar newAvatar = null; |
619 | try | 620 | try |
620 | { | 621 | { |
@@ -662,6 +663,8 @@ namespace OpenSim.world | |||
662 | return newAvatar; | 663 | return newAvatar; |
663 | } | 664 | } |
664 | 665 | ||
666 | |||
667 | |||
665 | 668 | ||
666 | 669 | ||
667 | public override void RemoveViewerAgent(ClientView agentClient) | 670 | public override void RemoveViewerAgent(ClientView agentClient) |