diff options
author | Mike Mazur | 2008-07-31 09:24:28 +0000 |
---|---|---|
committer | Mike Mazur | 2008-07-31 09:24:28 +0000 |
commit | 2270b252656146d9d74b84665a7ace6c3139db30 (patch) | |
tree | 7a967ee50349cf4301ed801e0b8c85f5060ffe1d /OpenSim/Data/MSSQL | |
parent | dropping intermediate GridInfoPlugin.addin.xml, as it's no longer (diff) | |
download | opensim-SC_OLD-2270b252656146d9d74b84665a7ace6c3139db30.zip opensim-SC_OLD-2270b252656146d9d74b84665a7ace6c3139db30.tar.gz opensim-SC_OLD-2270b252656146d9d74b84665a7ace6c3139db30.tar.bz2 opensim-SC_OLD-2270b252656146d9d74b84665a7ace6c3139db30.tar.xz |
Thanks, sempuki, for a patch that moves all Grid Server's plugins to
PluginLoader. Fix issue 1871.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLAssetData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLInventoryData.cs | 20 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLUserData.cs | 8 |
3 files changed, 22 insertions, 8 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs index e0e20df..443907f 100644 --- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs +++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Data.MSSQL | |||
45 | 45 | ||
46 | private MSSQLManager database; | 46 | private MSSQLManager database; |
47 | 47 | ||
48 | #region IAssetProvider Members | 48 | #region IAssetProviderPlugin Members |
49 | 49 | ||
50 | /// <summary> | 50 | /// <summary> |
51 | /// Migration method | 51 | /// Migration method |
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs index 4a8d6e9..9e60b16 100644 --- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs +++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs | |||
@@ -39,7 +39,7 @@ namespace OpenSim.Data.MSSQL | |||
39 | /// <summary> | 39 | /// <summary> |
40 | /// A MSSQL interface for the inventory server | 40 | /// A MSSQL interface for the inventory server |
41 | /// </summary> | 41 | /// </summary> |
42 | public class MSSQLInventoryData : IInventoryData | 42 | public class MSSQLInventoryData : IInventoryDataPlugin |
43 | { | 43 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
@@ -59,6 +59,12 @@ namespace OpenSim.Data.MSSQL | |||
59 | /// </summary> | 59 | /// </summary> |
60 | private MSSQLManager database; | 60 | private MSSQLManager database; |
61 | 61 | ||
62 | public void Initialise() | ||
63 | { | ||
64 | m_log.Info("[MSSQLInventoryData]: " + Name + " cannot be default-initialized!"); | ||
65 | throw new PluginNotInitialisedException (Name); | ||
66 | } | ||
67 | |||
62 | /// <summary> | 68 | /// <summary> |
63 | /// Loads and initialises the MSSQL inventory storage interface | 69 | /// Loads and initialises the MSSQL inventory storage interface |
64 | /// </summary> | 70 | /// </summary> |
@@ -134,15 +140,15 @@ namespace OpenSim.Data.MSSQL | |||
134 | /// The name of this DB provider | 140 | /// The name of this DB provider |
135 | /// </summary> | 141 | /// </summary> |
136 | /// <returns>A string containing the name of the DB provider</returns> | 142 | /// <returns>A string containing the name of the DB provider</returns> |
137 | public string getName() | 143 | public string Name |
138 | { | 144 | { |
139 | return "MSSQL Inventory Data Interface"; | 145 | get { return "MSSQL Inventory Data Interface"; } |
140 | } | 146 | } |
141 | 147 | ||
142 | /// <summary> | 148 | /// <summary> |
143 | /// Closes this DB provider | 149 | /// Closes this DB provider |
144 | /// </summary> | 150 | /// </summary> |
145 | public void Close() | 151 | public void Dispose() |
146 | { | 152 | { |
147 | // Do nothing. | 153 | // Do nothing. |
148 | } | 154 | } |
@@ -151,9 +157,9 @@ namespace OpenSim.Data.MSSQL | |||
151 | /// Returns the version of this DB provider | 157 | /// Returns the version of this DB provider |
152 | /// </summary> | 158 | /// </summary> |
153 | /// <returns>A string containing the DB provider</returns> | 159 | /// <returns>A string containing the DB provider</returns> |
154 | public string getVersion() | 160 | public string Version |
155 | { | 161 | { |
156 | return database.getVersion(); | 162 | get { return database.getVersion(); } |
157 | } | 163 | } |
158 | 164 | ||
159 | /// <summary> | 165 | /// <summary> |
@@ -681,7 +687,7 @@ namespace OpenSim.Data.MSSQL | |||
681 | folders.Add(f); | 687 | folders.Add(f); |
682 | } | 688 | } |
683 | 689 | ||
684 | // See IInventoryData | 690 | // See IInventoryDataPlugin |
685 | public List<InventoryFolderBase> getFolderHierarchy(LLUUID parentID) | 691 | public List<InventoryFolderBase> getFolderHierarchy(LLUUID parentID) |
686 | { | 692 | { |
687 | List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); | 693 | List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); |
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs index 0593c62..0703aab 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs | |||
@@ -52,6 +52,12 @@ namespace OpenSim.Data.MSSQL | |||
52 | private string m_usersTableName; | 52 | private string m_usersTableName; |
53 | private string m_userFriendsTableName; | 53 | private string m_userFriendsTableName; |
54 | 54 | ||
55 | public override void Initialise() | ||
56 | { | ||
57 | m_log.Info("[MSSQLUserData]: " + Name + " cannot be default-initialized!"); | ||
58 | throw new PluginNotInitialisedException (Name); | ||
59 | } | ||
60 | |||
55 | /// <summary> | 61 | /// <summary> |
56 | /// Loads and initialises the MSSQL storage plugin | 62 | /// Loads and initialises the MSSQL storage plugin |
57 | /// </summary> | 63 | /// </summary> |
@@ -93,6 +99,8 @@ namespace OpenSim.Data.MSSQL | |||
93 | 99 | ||
94 | TestTables(); | 100 | TestTables(); |
95 | } | 101 | } |
102 | |||
103 | public override void Dispose () {} | ||
96 | 104 | ||
97 | /// <summary> | 105 | /// <summary> |
98 | /// | 106 | /// |