aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorAdam Frisby2007-07-15 15:40:50 +0000
committerAdam Frisby2007-07-15 15:40:50 +0000
commit8fc1dfec792f3527c7f153bd49852519d561d17a (patch)
tree0aae20f07b43c4ac9a4f2d5fff3f7eb1619733ab /OpenSim/Region/Application
parent* Typo in prebuild.xml (diff)
downloadopensim-SC-8fc1dfec792f3527c7f153bd49852519d561d17a.zip
opensim-SC-8fc1dfec792f3527c7f153bd49852519d561d17a.tar.gz
opensim-SC-8fc1dfec792f3527c7f153bd49852519d561d17a.tar.bz2
opensim-SC-8fc1dfec792f3527c7f153bd49852519d561d17a.tar.xz
* Added loading methods for NullStorage.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index acf09eb..7dd426a 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -44,6 +44,7 @@ using OpenSim.Region.ClientStack;
44using OpenSim.Region.Communications.Local; 44using OpenSim.Region.Communications.Local;
45using OpenSim.Region.Communications.OGS1; 45using OpenSim.Region.Communications.OGS1;
46using OpenSim.Region.Environment.Scenes; 46using OpenSim.Region.Environment.Scenes;
47using OpenSim.Region.Environment;
47using System.Text; 48using System.Text;
48 49
49namespace OpenSim 50namespace OpenSim
@@ -210,7 +211,9 @@ namespace OpenSim
210 m_udpServer.Add(udpServer); 211 m_udpServer.Add(udpServer);
211 this.regionData.Add(regionDat); 212 this.regionData.Add(regionDat);
212 213
213 LocalWorld = new Scene(udpServer.PacketServer.ClientManager, regionDat, authenBase, commsManager, this.AssetCache, httpServer); 214 StorageManager tmpStoreManager = new StorageManager("OpenSim.DataStore.NullStorage.dll", regionDat.DataStore, "base");
215
216 LocalWorld = new Scene(udpServer.PacketServer.ClientManager, regionDat, authenBase, commsManager, this.AssetCache, tmpStoreManager, httpServer);
214 this.m_localWorld.Add(LocalWorld); 217 this.m_localWorld.Add(LocalWorld);
215 //LocalWorld.InventoryCache = InventoryCache; 218 //LocalWorld.InventoryCache = InventoryCache;
216 //LocalWorld.AssetCache = AssetCache; 219 //LocalWorld.AssetCache = AssetCache;