diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/StorageManager.cs | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/OpenSim/Region/Environment/StorageManager.cs b/OpenSim/Region/Environment/StorageManager.cs index a478827..92e6523 100644 --- a/OpenSim/Region/Environment/StorageManager.cs +++ b/OpenSim/Region/Environment/StorageManager.cs | |||
@@ -1,15 +1,7 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | using OpenSim.Framework; | ||
6 | using OpenSim.Framework.Communications; | ||
7 | using OpenSim.Framework.Servers; | ||
8 | using OpenSim.Region.Capabilities; | ||
9 | using OpenSim.Region.Environment.Scenes; | ||
10 | using OpenSim.Region.Environment.Interfaces; | ||
11 | |||
12 | using System.Reflection; | 2 | using System.Reflection; |
3 | using OpenSim.Framework.Console; | ||
4 | using OpenSim.Region.Environment.Interfaces; | ||
13 | 5 | ||
14 | namespace OpenSim.Region.Environment | 6 | namespace OpenSim.Region.Environment |
15 | { | 7 | { |
@@ -19,10 +11,7 @@ namespace OpenSim.Region.Environment | |||
19 | 11 | ||
20 | public IRegionDataStore DataStore | 12 | public IRegionDataStore DataStore |
21 | { | 13 | { |
22 | get | 14 | get { return m_dataStore; } |
23 | { | ||
24 | return m_dataStore; | ||
25 | } | ||
26 | } | 15 | } |
27 | 16 | ||
28 | public StorageManager(IRegionDataStore storage) | 17 | public StorageManager(IRegionDataStore storage) |
@@ -32,7 +21,7 @@ namespace OpenSim.Region.Environment | |||
32 | 21 | ||
33 | public StorageManager(string dllName, string dataStoreFile, string dataStoreDB) | 22 | public StorageManager(string dllName, string dataStoreFile, string dataStoreDB) |
34 | { | 23 | { |
35 | OpenSim.Framework.Console.MainLog.Instance.Verbose("DATASTORE", "Attempting to load " + dllName); | 24 | MainLog.Instance.Verbose("DATASTORE", "Attempting to load " + dllName); |
36 | Assembly pluginAssembly = Assembly.LoadFrom(dllName); | 25 | Assembly pluginAssembly = Assembly.LoadFrom(dllName); |
37 | 26 | ||
38 | foreach (Type pluginType in pluginAssembly.GetTypes()) | 27 | foreach (Type pluginType in pluginAssembly.GetTypes()) |
@@ -43,12 +32,13 @@ namespace OpenSim.Region.Environment | |||
43 | 32 | ||
44 | if (typeInterface != null) | 33 | if (typeInterface != null) |
45 | { | 34 | { |
46 | IRegionDataStore plug = (IRegionDataStore)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 35 | IRegionDataStore plug = |
36 | (IRegionDataStore) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | ||
47 | plug.Initialise(dataStoreFile, dataStoreDB); | 37 | plug.Initialise(dataStoreFile, dataStoreDB); |
48 | 38 | ||
49 | m_dataStore = plug; | 39 | m_dataStore = plug; |
50 | 40 | ||
51 | OpenSim.Framework.Console.MainLog.Instance.Verbose("DATASTORE", "Added IRegionDataStore Interface"); | 41 | MainLog.Instance.Verbose("DATASTORE", "Added IRegionDataStore Interface"); |
52 | } | 42 | } |
53 | 43 | ||
54 | typeInterface = null; | 44 | typeInterface = null; |
@@ -60,4 +50,4 @@ namespace OpenSim.Region.Environment | |||
60 | //TODO: Add checking and warning to make sure it initialised. | 50 | //TODO: Add checking and warning to make sure it initialised. |
61 | } | 51 | } |
62 | } | 52 | } |
63 | } | 53 | } \ No newline at end of file |