diff options
| author | Adam Frisby | 2007-07-15 17:32:54 +0000 |
|---|---|---|
| committer | Adam Frisby | 2007-07-15 17:32:54 +0000 |
| commit | aebd58d75e7e4c46c074cb8266481850f4841cb9 (patch) | |
| tree | 57d25bf2fc29c7951792ac173e1cee8e9e1cf38a /OpenSim/Region | |
| parent | * Marked old terrain methods as obsolete. (diff) | |
| download | opensim-SC_OLD-aebd58d75e7e4c46c074cb8266481850f4841cb9.zip opensim-SC_OLD-aebd58d75e7e4c46c074cb8266481850f4841cb9.tar.gz opensim-SC_OLD-aebd58d75e7e4c46c074cb8266481850f4841cb9.tar.bz2 opensim-SC_OLD-aebd58d75e7e4c46c074cb8266481850f4841cb9.tar.xz | |
* PROTIP: It helps to know what your doing when playing with reflection.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Environment/StorageManager.cs | 19 | ||||
| -rw-r--r-- | OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs | 2 |
2 files changed, 9 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/StorageManager.cs b/OpenSim/Region/Environment/StorageManager.cs index 9f2730f..8f8ac97 100644 --- a/OpenSim/Region/Environment/StorageManager.cs +++ b/OpenSim/Region/Environment/StorageManager.cs | |||
| @@ -38,20 +38,17 @@ namespace OpenSim.Region.Environment | |||
| 38 | { | 38 | { |
| 39 | if (pluginType.IsPublic) | 39 | if (pluginType.IsPublic) |
| 40 | { | 40 | { |
| 41 | if (!pluginType.IsAbstract) | 41 | Type typeInterface = pluginType.GetInterface("IRegionDataStore", true); |
| 42 | { | ||
| 43 | Type typeInterface = pluginType.GetInterface("IRegionDataStore", true); | ||
| 44 | |||
| 45 | if (typeInterface != null) | ||
| 46 | { | ||
| 47 | IRegionDataStore plug = (IRegionDataStore)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | ||
| 48 | plug.Initialise(dataStoreFile, dataStoreDB); | ||
| 49 | 42 | ||
| 50 | m_dataStore = plug; | 43 | if (typeInterface != null) |
| 51 | } | 44 | { |
| 45 | IRegionDataStore plug = (IRegionDataStore)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | ||
| 46 | plug.Initialise(dataStoreFile, dataStoreDB); | ||
| 52 | 47 | ||
| 53 | typeInterface = null; | 48 | m_dataStore = plug; |
| 54 | } | 49 | } |
| 50 | |||
| 51 | typeInterface = null; | ||
| 55 | } | 52 | } |
| 56 | } | 53 | } |
| 57 | 54 | ||
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs index 8542ef3..7c8bd07 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs | |||
| @@ -10,7 +10,7 @@ using libsecondlife; | |||
| 10 | 10 | ||
| 11 | namespace OpenSim.DataStore.NullStorage | 11 | namespace OpenSim.DataStore.NullStorage |
| 12 | { | 12 | { |
| 13 | class NullDataStore : IRegionDataStore | 13 | public class NullDataStore : IRegionDataStore |
| 14 | { | 14 | { |
| 15 | public void Initialise(string dbfile, string dbname) | 15 | public void Initialise(string dbfile, string dbname) |
| 16 | { | 16 | { |