aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer/world/World.cs
diff options
context:
space:
mode:
authormingchen2007-06-04 14:09:19 +0000
committermingchen2007-06-04 14:09:19 +0000
commit17421593528f4126256dea6d0c844da9c218fdb7 (patch)
tree69025fb439a08c24787a226b708f7b271610c548 /OpenSim/OpenSim.RegionServer/world/World.cs
parentSmall bugfix. (diff)
downloadopensim-SC_OLD-17421593528f4126256dea6d0c844da9c218fdb7.zip
opensim-SC_OLD-17421593528f4126256dea6d0c844da9c218fdb7.tar.gz
opensim-SC_OLD-17421593528f4126256dea6d0c844da9c218fdb7.tar.bz2
opensim-SC_OLD-17421593528f4126256dea6d0c844da9c218fdb7.tar.xz
Parcel Manager Changes:
*Added Parcel Backup Support for DB4. Other storages currently do not save *Added parcelIDList in ParcelManager to speed up parcel fetching at position *Added ParcelData.cs and ParcelData class for better storage support *Documentation for parcel added *2 Parcel Related bug fixes
Diffstat (limited to 'OpenSim/OpenSim.RegionServer/world/World.cs')
-rw-r--r--OpenSim/OpenSim.RegionServer/world/World.cs16
1 files changed, 13 insertions, 3 deletions
diff --git a/OpenSim/OpenSim.RegionServer/world/World.cs b/OpenSim/OpenSim.RegionServer/world/World.cs
index d2a13ca..92de6f0 100644
--- a/OpenSim/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim/OpenSim.RegionServer/world/World.cs
@@ -35,7 +35,7 @@ namespace OpenSim.world
35 private Dictionary<string, ScriptFactory> m_scripts; 35 private Dictionary<string, ScriptFactory> m_scripts;
36 private Mutex updateLock; 36 private Mutex updateLock;
37 public string m_datastore; 37 public string m_datastore;
38 public ParcelManager parcelManager; 38 public OpenSim.RegionServer.world.ParcelManager parcelManager;
39 39
40 #region Properties 40 #region Properties
41 public PhysicsScene PhysScene 41 public PhysicsScene PhysScene
@@ -86,7 +86,6 @@ namespace OpenSim.world
86 Avatar.LoadAnims(); 86 Avatar.LoadAnims();
87 this.SetDefaultScripts(); 87 this.SetDefaultScripts();
88 this.LoadScriptEngines(); 88 this.LoadScriptEngines();
89 parcelManager = new ParcelManager(this);
90 89
91 } 90 }
92 catch (Exception e) 91 catch (Exception e)
@@ -252,6 +251,17 @@ namespace OpenSim.world
252 Entities[UUID].BackUp(); 251 Entities[UUID].BackUp();
253 } 252 }
254 253
254
255 //Parcel backup routines. Yay!
256 ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count];
257 int i;
258 for(i = 0; i < parcelManager.parcelList.Count; i++)
259 {
260 parcels[i] = parcelManager.parcelList[i].parcelData;
261 }
262 localStorage.SaveParcels(parcels);
263
264
255 // Backup successful 265 // Backup successful
256 return true; 266 return true;
257 } 267 }
@@ -576,7 +586,7 @@ namespace OpenSim.world
576 agentClient.OnUpdatePrimScale += new ClientView.UpdatePrimVector(this.UpdatePrimScale); 586 agentClient.OnUpdatePrimScale += new ClientView.UpdatePrimVector(this.UpdatePrimScale);
577 agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject); 587 agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject);
578 588
579 agentClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(ParcelPropertiesRequest); 589 agentClient.OnParcelPropertiesRequest += new OpenSim.RegionServer.world.ParcelPropertiesRequest(ParcelPropertiesRequest);
580 Avatar newAvatar = null; 590 Avatar newAvatar = null;
581 try 591 try
582 { 592 {