aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2007-07-15 18:49:11 +0000
committerAdam Frisby2007-07-15 18:49:11 +0000
commit61446c0cd8b4a81ddf98d0a3c246f4c9d8239fed (patch)
tree9281b3991118f2d6697bb39b57dd42c28713d1ac
parent* More prebuild.xml changes. (diff)
downloadopensim-SC-61446c0cd8b4a81ddf98d0a3c246f4c9d8239fed.zip
opensim-SC-61446c0cd8b4a81ddf98d0a3c246f4c9d8239fed.tar.gz
opensim-SC-61446c0cd8b4a81ddf98d0a3c246f4c9d8239fed.tar.bz2
opensim-SC-61446c0cd8b4a81ddf98d0a3c246f4c9d8239fed.tar.xz
* Primitives are now loaded from Datastore during scene initialisation.
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index d9b630e..0186ba8 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -146,6 +146,15 @@ namespace OpenSim.Region.Environment.Scenes
146 Avatars = new Dictionary<LLUUID, ScenePresence>(); 146 Avatars = new Dictionary<LLUUID, ScenePresence>();
147 Prims = new Dictionary<LLUUID, SceneObject>(); 147 Prims = new Dictionary<LLUUID, SceneObject>();
148 148
149 MainLog.Instance.Verbose("World.cs - loading objects from datastore");
150 List<SceneObject> PrimsFromDB = storageManager.DataStore.LoadObjects();
151 foreach (SceneObject prim in PrimsFromDB)
152 {
153 Prims.Add(prim.uuid, prim);
154 }
155 MainLog.Instance.Verbose("World.cs - loaded " + PrimsFromDB.Count.ToString() + " object(s)");
156
157
149 MainLog.Instance.Verbose("World.cs - creating LandMap"); 158 MainLog.Instance.Verbose("World.cs - creating LandMap");
150 Terrain = new TerrainEngine(); 159 Terrain = new TerrainEngine();
151 160