aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/RegionApplicationBase.cs
diff options
context:
space:
mode:
authorAdam Frisby2007-07-19 00:42:59 +0000
committerAdam Frisby2007-07-19 00:42:59 +0000
commit920ffaf24bc3bb5f8b7578f86efc1d5e9c52cec4 (patch)
tree950bf957d64ac5ab909d311258ccc89630c7aabe /OpenSim/Region/ClientStack/RegionApplicationBase.cs
parent* Removed yet more compiler warnings (diff)
downloadopensim-SC-920ffaf24bc3bb5f8b7578f86efc1d5e9c52cec4.zip
opensim-SC-920ffaf24bc3bb5f8b7578f86efc1d5e9c52cec4.tar.gz
opensim-SC-920ffaf24bc3bb5f8b7578f86efc1d5e9c52cec4.tar.bz2
opensim-SC-920ffaf24bc3bb5f8b7578f86efc1d5e9c52cec4.tar.xz
* Cleaned out remaining references to the old LocalStorage system in prep. to move to StorageManager.
Diffstat (limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 375306d..e0339d9 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -111,7 +111,6 @@ namespace OpenSim.Region.ClientStack
111 111
112 udpServer.LocalWorld = scene; 112 udpServer.LocalWorld = scene;
113 113
114 scene.LoadStorageDLL("OpenSim.Region.Storage.LocalStorageDb4o.dll");
115 scene.LoadWorldMap(); 114 scene.LoadWorldMap();
116 115
117 scene.PhysScene = GetPhysicsScene( ); 116 scene.PhysScene = GetPhysicsScene( );
@@ -124,13 +123,13 @@ namespace OpenSim.Region.ClientStack
124 { 123 {
125 m_log.Notice("Parcels - Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]"); 124 m_log.Notice("Parcels - Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]");
126 scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID; 125 scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
127 scene.localStorage.LoadLandObjects((ILocalStorageLandObjectReceiver)scene.LandManager); 126 //TODO: Load parcels from storageManager
128 } 127 }
129 else 128 else
130 { 129 {
131 m_log.Notice("Parcels - No master avatar found, using null."); 130 m_log.Notice("Parcels - No master avatar found, using null.");
132 scene.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero; 131 scene.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero;
133 scene.localStorage.LoadLandObjects((ILocalStorageLandObjectReceiver)scene.LandManager); 132 //TODO: Load parcels from storageManager
134 } 133 }
135 scene.performParcelPrimCountUpdate(); 134 scene.performParcelPrimCountUpdate();
136 scene.StartTimer(); 135 scene.StartTimer();