From 8fc1dfec792f3527c7f153bd49852519d561d17a Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Sun, 15 Jul 2007 15:40:50 +0000 Subject: * Added loading methods for NullStorage. --- OpenSim/Region/Examples/SimpleApp/MyWorld.cs | 6 ++++-- OpenSim/Region/Examples/SimpleApp/Program.cs | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/Examples') diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs index d0e3fed..bdf1263 100644 --- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs +++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs @@ -8,6 +8,8 @@ using OpenSim.Framework.Types; using OpenSim.Region.Caches; using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Terrain; +using OpenSim.Region.Environment; + using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence; namespace SimpleApp @@ -16,8 +18,8 @@ namespace SimpleApp { private List m_avatars; - public MyWorld(ClientManager clientManager, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer) - : base(clientManager, regionInfo, authen, commsMan, assetCach, httpServer) + public MyWorld(ClientManager clientManager, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, StorageManager storeMan, BaseHttpServer httpServer) + : base(clientManager, regionInfo, authen, commsMan, assetCach, storeMan, httpServer) { m_avatars = new List(); } diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs index ce60512..1c502ed 100644 --- a/OpenSim/Region/Examples/SimpleApp/Program.cs +++ b/OpenSim/Region/Examples/SimpleApp/Program.cs @@ -60,7 +60,9 @@ namespace SimpleApp RegionInfo regionInfo = new RegionInfo(1000, 1000, internalEndPoint, "127.0.0.1"); - world = new MyWorld(packetServer.ClientManager, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer); + OpenSim.Region.Environment.StorageManager storeMan = new OpenSim.Region.Environment.StorageManager("OpenSim.DataStore.NullStorage.dll", "simpleapp.yap", "simpleapp"); + + world = new MyWorld(packetServer.ClientManager, regionInfo, m_circuitManager, communicationsManager, assetCache, storeMan, httpServer); world.PhysScene = physManager.GetPhysicsScene("basicphysics"); //PhysicsScene.Null; world.LoadWorldMap(); -- cgit v1.1