aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteInventoryStore.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs33
1 files changed, 21 insertions, 12 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index 99560a0..ef4ef99 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Data.SQLite
39 /// <summary> 39 /// <summary>
40 /// An Inventory Interface to the SQLite database 40 /// An Inventory Interface to the SQLite database
41 /// </summary> 41 /// </summary>
42 public class SQLiteInventoryStore : SQLiteUtil, IInventoryData 42 public class SQLiteInventoryStore : SQLiteUtil, 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
@@ -50,6 +50,12 @@ namespace OpenSim.Data.SQLite
50 private SqliteDataAdapter invItemsDa; 50 private SqliteDataAdapter invItemsDa;
51 private SqliteDataAdapter invFoldersDa; 51 private SqliteDataAdapter invFoldersDa;
52 52
53 public void Initialise()
54 {
55 m_log.Info("[SQLiteInventoryData]: " + Name + " cannot be default-initialized!");
56 throw new PluginNotInitialisedException (Name);
57 }
58
53 /// <summary> 59 /// <summary>
54 /// <list type="bullet"> 60 /// <list type="bullet">
55 /// <item>Initialises Inventory interface</item> 61 /// <item>Initialises Inventory interface</item>
@@ -277,7 +283,7 @@ namespace OpenSim.Data.SQLite
277 /// <summary> 283 /// <summary>
278 /// Closes the inventory interface 284 /// Closes the inventory interface
279 /// </summary> 285 /// </summary>
280 public void Close() 286 public void Dispose()
281 { 287 {
282 } 288 }
283 289
@@ -285,25 +291,28 @@ namespace OpenSim.Data.SQLite
285 /// The name of this DB provider 291 /// The name of this DB provider
286 /// </summary> 292 /// </summary>
287 /// <returns>Name of DB provider</returns> 293 /// <returns>Name of DB provider</returns>
288 public string getName() 294 public string Name
289 { 295 {
290 return "SQLite Inventory Data Interface"; 296 get { return "SQLite Inventory Data Interface"; }
291 } 297 }
292 298
293 /// <summary> 299 /// <summary>
294 /// Returns the version of this DB provider 300 /// Returns the version of this DB provider
295 /// </summary> 301 /// </summary>
296 /// <returns>A string containing the DB provider version</returns> 302 /// <returns>A string containing the DB provider version</returns>
297 public string getVersion() 303 public string Version
298 { 304 {
299 Module module = GetType().Module; 305 get
300 // string dllName = module.Assembly.ManifestModule.Name; 306 {
301 Version dllVersion = module.Assembly.GetName().Version; 307 Module module = GetType().Module;
308 // string dllName = module.Assembly.ManifestModule.Name;
309 Version dllVersion = module.Assembly.GetName().Version;
302 310
303 311
304 return 312 return
305 string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build, 313 string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build,
306 dllVersion.Revision); 314 dllVersion.Revision);
315 }
307 } 316 }
308 317
309 /// <summary> 318 /// <summary>
@@ -399,7 +408,7 @@ namespace OpenSim.Data.SQLite
399 } 408 }
400 409
401 /// <summary> 410 /// <summary>
402 /// See IInventoryData 411 /// See IInventoryDataPlugin
403 /// </summary> 412 /// </summary>
404 /// <param name="parentID"></param> 413 /// <param name="parentID"></param>
405 /// <returns></returns> 414 /// <returns></returns>