diff options
author | Adam Frisby | 2007-07-15 15:40:50 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-15 15:40:50 +0000 |
commit | 8fc1dfec792f3527c7f153bd49852519d561d17a (patch) | |
tree | 0aae20f07b43c4ac9a4f2d5fff3f7eb1619733ab /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | * Typo in prebuild.xml (diff) | |
download | opensim-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/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 64f51d8..782c0fd 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -39,6 +39,7 @@ using OpenSim.Framework.Servers; | |||
39 | using OpenSim.Framework.Types; | 39 | using OpenSim.Framework.Types; |
40 | using OpenSim.Physics.Manager; | 40 | using OpenSim.Physics.Manager; |
41 | using OpenSim.Region.Caches; | 41 | using OpenSim.Region.Caches; |
42 | using OpenSim.Region.Interfaces; | ||
42 | using OpenSim.Region.Scripting; | 43 | using OpenSim.Region.Scripting; |
43 | using OpenSim.Region.Terrain; | 44 | using OpenSim.Region.Terrain; |
44 | using Caps = OpenSim.Region.Capabilities.Caps; | 45 | using Caps = OpenSim.Region.Capabilities.Caps; |
@@ -65,6 +66,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
65 | protected AuthenticateSessionsBase authenticateHandler; | 66 | protected AuthenticateSessionsBase authenticateHandler; |
66 | protected RegionCommsListener regionCommsHost; | 67 | protected RegionCommsListener regionCommsHost; |
67 | protected CommunicationsManager commsManager; | 68 | protected CommunicationsManager commsManager; |
69 | protected StorageManager storageManager; | ||
68 | 70 | ||
69 | protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>(); | 71 | protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>(); |
70 | protected BaseHttpServer httpListener; | 72 | protected BaseHttpServer httpListener; |
@@ -118,11 +120,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
118 | /// <param name="clientThreads">Dictionary to contain client threads</param> | 120 | /// <param name="clientThreads">Dictionary to contain client threads</param> |
119 | /// <param name="regionHandle">Region Handle for this region</param> | 121 | /// <param name="regionHandle">Region Handle for this region</param> |
120 | /// <param name="regionName">Region Name for this region</param> | 122 | /// <param name="regionName">Region Name for this region</param> |
121 | public Scene(ClientManager clientManager, RegionInfo regInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer) | 123 | public Scene(ClientManager clientManager, RegionInfo regInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer) |
122 | { | 124 | { |
123 | updateLock = new Mutex(false); | 125 | updateLock = new Mutex(false); |
124 | this.authenticateHandler = authen; | 126 | this.authenticateHandler = authen; |
125 | this.commsManager = commsMan; | 127 | this.commsManager = commsMan; |
128 | this.storageManager = storeManager; | ||
126 | this.assetCache = assetCach; | 129 | this.assetCache = assetCach; |
127 | m_clientManager = clientManager; | 130 | m_clientManager = clientManager; |
128 | m_regInfo = regInfo; | 131 | m_regInfo = regInfo; |