aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer/world/World.cs
diff options
context:
space:
mode:
authormingchen2007-06-06 03:00:59 +0000
committermingchen2007-06-06 03:00:59 +0000
commitea798195758a6692b583930e5846c643157143be (patch)
tree50ac10b862332a622dc50c991591cc65c084d9b5 /OpenSim/OpenSim.RegionServer/world/World.cs
parentUnhippos! (diff)
downloadopensim-SC_OLD-ea798195758a6692b583930e5846c643157143be.zip
opensim-SC_OLD-ea798195758a6692b583930e5846c643157143be.tar.gz
opensim-SC_OLD-ea798195758a6692b583930e5846c643157143be.tar.bz2
opensim-SC_OLD-ea798195758a6692b583930e5846c643157143be.tar.xz
Changes:
*Added support for Subdivision (use master avatar to login to try out) *Added Parcel Border support *Enabled user account storage, but only when a new account is created Bug Fixes: *Fixed crash on startup while in sandbox when "Setting up master avatar" *Fixed most core functions in ParcelManager and Parcel that where broken *Fixed Parcel saving to database Known Issues: *Dividing parcel fails in viewer (gives an error about needing 2 parcels)
Diffstat (limited to 'OpenSim/OpenSim.RegionServer/world/World.cs')
-rw-r--r--OpenSim/OpenSim.RegionServer/world/World.cs7
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)