diff options
author | Mike Mazur | 2008-07-18 04:51:41 +0000 |
---|---|---|
committer | Mike Mazur | 2008-07-18 04:51:41 +0000 |
commit | e0e0db366061eae148364e3d5670f275b1ab25b7 (patch) | |
tree | cbd4890958aa28a3ff98a917909ec77247a80d00 /OpenSim/Data/MySQL/MySQLGridData.cs | |
parent | Make scripts LSL compliant. (diff) | |
download | opensim-SC_OLD-e0e0db366061eae148364e3d5670f275b1ab25b7.zip opensim-SC_OLD-e0e0db366061eae148364e3d5670f275b1ab25b7.tar.gz opensim-SC_OLD-e0e0db366061eae148364e3d5670f275b1ab25b7.tar.bz2 opensim-SC_OLD-e0e0db366061eae148364e3d5670f275b1ab25b7.tar.xz |
Thanks, sempuki, for a patch that moves all grid plugins to new PluginLoader (issue 1763).
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLGridData.cs | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs index bb71c99..8142c74 100644 --- a/OpenSim/Data/MySQL/MySQLGridData.cs +++ b/OpenSim/Data/MySQL/MySQLGridData.cs | |||
@@ -33,12 +33,18 @@ using System.Security.Cryptography; | |||
33 | using System.Text; | 33 | using System.Text; |
34 | using libsecondlife; | 34 | using libsecondlife; |
35 | using log4net; | 35 | using log4net; |
36 | using Mono.Addins; | ||
37 | using OpenSim.Framework; | ||
38 | |||
39 | [assembly : Addin] | ||
40 | [assembly : AddinDependency("OpenSim.Data", "0.5")] | ||
36 | 41 | ||
37 | namespace OpenSim.Data.MySQL | 42 | namespace OpenSim.Data.MySQL |
38 | { | 43 | { |
39 | /// <summary> | 44 | /// <summary> |
40 | /// A MySQL Interface for the Grid Server | 45 | /// A MySQL Interface for the Grid Server |
41 | /// </summary> | 46 | /// </summary> |
47 | [Extension("/OpenSim/GridDataStore")] | ||
42 | public class MySQLGridData : GridDataBase | 48 | public class MySQLGridData : GridDataBase |
43 | { | 49 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -48,6 +54,12 @@ namespace OpenSim.Data.MySQL | |||
48 | /// </summary> | 54 | /// </summary> |
49 | private MySQLManager database; | 55 | private MySQLManager database; |
50 | 56 | ||
57 | override public void Initialise() | ||
58 | { | ||
59 | m_log.Info("[MySQLLogData]: " + Name + " cannot be default-initialized!"); | ||
60 | throw new PluginNotInitialisedException (Name); | ||
61 | } | ||
62 | |||
51 | /// <summary> | 63 | /// <summary> |
52 | /// <para>Initialises Grid interface</para> | 64 | /// <para>Initialises Grid interface</para> |
53 | /// <para> | 65 | /// <para> |
@@ -144,7 +156,7 @@ namespace OpenSim.Data.MySQL | |||
144 | /// <summary> | 156 | /// <summary> |
145 | /// Shuts down the grid interface | 157 | /// Shuts down the grid interface |
146 | /// </summary> | 158 | /// </summary> |
147 | override public void Close() | 159 | override public void Dispose() |
148 | { | 160 | { |
149 | database.Close(); | 161 | database.Close(); |
150 | } | 162 | } |
@@ -153,18 +165,18 @@ namespace OpenSim.Data.MySQL | |||
153 | /// Returns the plugin name | 165 | /// Returns the plugin name |
154 | /// </summary> | 166 | /// </summary> |
155 | /// <returns>Plugin name</returns> | 167 | /// <returns>Plugin name</returns> |
156 | override public string getName() | 168 | override public string Name |
157 | { | 169 | { |
158 | return "MySql OpenGridData"; | 170 | get { return "MySql OpenGridData"; } |
159 | } | 171 | } |
160 | 172 | ||
161 | /// <summary> | 173 | /// <summary> |
162 | /// Returns the plugin version | 174 | /// Returns the plugin version |
163 | /// </summary> | 175 | /// </summary> |
164 | /// <returns>Plugin version</returns> | 176 | /// <returns>Plugin version</returns> |
165 | override public string getVersion() | 177 | override public string Version |
166 | { | 178 | { |
167 | return "0.1"; | 179 | get { return "0.1"; } |
168 | } | 180 | } |
169 | 181 | ||
170 | /// <summary> | 182 | /// <summary> |