diff options
Diffstat (limited to 'OpenSim/Region/Framework/StorageManager.cs')
-rw-r--r-- | OpenSim/Region/Framework/StorageManager.cs | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/OpenSim/Region/Framework/StorageManager.cs b/OpenSim/Region/Framework/StorageManager.cs index 47db2b3..c858d56 100644 --- a/OpenSim/Region/Framework/StorageManager.cs +++ b/OpenSim/Region/Framework/StorageManager.cs | |||
@@ -36,24 +36,8 @@ namespace OpenSim.Region.Framework | |||
36 | { | 36 | { |
37 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 37 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
38 | 38 | ||
39 | protected ISimulationDataStore m_dataStore; | 39 | public readonly ISimulationDataStore DataStore; |
40 | 40 | public readonly IEstateDataStore EstateDataStore; | |
41 | public ISimulationDataStore DataStore | ||
42 | { | ||
43 | get { return m_dataStore; } | ||
44 | } | ||
45 | |||
46 | private IEstateDataStore m_estateDataStore; | ||
47 | |||
48 | public IEstateDataStore EstateDataStore | ||
49 | { | ||
50 | get { return m_estateDataStore; } | ||
51 | } | ||
52 | |||
53 | public StorageManager(ISimulationDataStore storage) | ||
54 | { | ||
55 | m_dataStore = storage; | ||
56 | } | ||
57 | 41 | ||
58 | public StorageManager(string dllName, string connectionstring, string estateconnectionstring) | 42 | public StorageManager(string dllName, string connectionstring, string estateconnectionstring) |
59 | { | 43 | { |
@@ -72,7 +56,7 @@ namespace OpenSim.Region.Framework | |||
72 | (ISimulationDataStore)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 56 | (ISimulationDataStore)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); |
73 | plug.Initialise(connectionstring); | 57 | plug.Initialise(connectionstring); |
74 | 58 | ||
75 | m_dataStore = plug; | 59 | DataStore = plug; |
76 | 60 | ||
77 | m_log.Info("[DATASTORE]: Added ISimulationDataStore Interface"); | 61 | m_log.Info("[DATASTORE]: Added ISimulationDataStore Interface"); |
78 | } | 62 | } |
@@ -85,7 +69,7 @@ namespace OpenSim.Region.Framework | |||
85 | (IEstateDataStore) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 69 | (IEstateDataStore) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); |
86 | estPlug.Initialise(estateconnectionstring); | 70 | estPlug.Initialise(estateconnectionstring); |
87 | 71 | ||
88 | m_estateDataStore = estPlug; | 72 | EstateDataStore = estPlug; |
89 | } | 73 | } |
90 | } | 74 | } |
91 | } | 75 | } |