From 0db1ed0b5a6f5bd104c6008f142d173c84263ce5 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Sun, 12 Sep 2010 14:20:26 -0700
Subject: * Added ISimulationDataService and IEstateDataService * Removed
StorageManager * CONFIG CHANGE: There are no more database settings in
OpenSim.ini. Check the config-include configuration files for region store
and estate store database settings
---
OpenSim/Data/MSSQL/MSSQLEstateData.cs | 9 +++++++++
OpenSim/Data/MSSQL/MSSQLSimulationData.cs | 10 ++++++++++
OpenSim/Data/MySQL/MySQLEstateData.cs | 9 +++++++++
OpenSim/Data/MySQL/MySQLSimulationData.cs | 9 +++++++++
OpenSim/Data/SQLite/SQLiteEstateData.cs | 9 +++++++++
OpenSim/Data/SQLite/SQLiteSimulationData.cs | 9 +++++++++
OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs | 9 +++++++++
OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs | 9 +++++++++
8 files changed, 73 insertions(+)
(limited to 'OpenSim/Data')
diff --git a/OpenSim/Data/MSSQL/MSSQLEstateData.cs b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
index 80bf106..e9a0935 100644
--- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
@@ -50,6 +50,15 @@ namespace OpenSim.Data.MSSQL
#region Public methods
+ public MSSQLEstateStore()
+ {
+ }
+
+ public MSSQLEstateStore(string connectionString)
+ {
+ Initialise(connectionString);
+ }
+
/// <summary>
/// Initialises the estatedata class.
/// </summary>
diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
index ae105d5..8532af4 100644
--- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
@@ -55,6 +55,16 @@ namespace OpenSim.Data.MSSQL
/// </summary>
private MSSQLManager _Database;
private string m_connectionString;
+
+ public MSSQLSimulationData()
+ {
+ }
+
+ public MSSQLSimulationData(string connectionString)
+ {
+ Initialise(connectionString);
+ }
+
/// <summary>
/// Initialises the region datastore
/// </summary>
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index 9158f7a..c42c687 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -54,6 +54,15 @@ namespace OpenSim.Data.MySQL
private Dictionary<string, FieldInfo> m_FieldMap =
new Dictionary<string, FieldInfo>();
+ public MySQLEstateStore()
+ {
+ }
+
+ public MySQLEstateStore(string connectionString)
+ {
+ Initialise(connectionString);
+ }
+
public void Initialise(string connectionString)
{
m_connectionString = connectionString;
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 36f73ef..ac752f6 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -52,6 +52,15 @@ namespace OpenSim.Data.MySQL
private string m_connectionString;
private object m_dbLock = new object();
+ public MySQLSimulationData()
+ {
+ }
+
+ public MySQLSimulationData(string connectionString)
+ {
+ Initialise(connectionString);
+ }
+
public void Initialise(string connectionString)
{
m_connectionString = connectionString;
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index fcf041e..d1d67eb 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -49,6 +49,15 @@ namespace OpenSim.Data.SQLite
private Dictionary<string, FieldInfo> m_FieldMap =
new Dictionary<string, FieldInfo>();
+ public SQLiteEstateStore()
+ {
+ }
+
+ public SQLiteEstateStore(string connectionString)
+ {
+ Initialise(connectionString);
+ }
+
public void Initialise(string connectionString)
{
m_connectionString = connectionString;
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 1820f78..7e62e84 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -70,6 +70,15 @@ namespace OpenSim.Data.SQLite
private String m_connectionString;
+ public SQLiteSimulationData()
+ {
+ }
+
+ public SQLiteSimulationData(string connectionString)
+ {
+ Initialise(connectionString);
+ }
+
// Temporary attribute while this is experimental
/***********************************************************************
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs
index bf8ee14..547ea6b 100644
--- a/OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs
@@ -49,6 +49,15 @@ namespace OpenSim.Data.SQLiteLegacy
private Dictionary<string, FieldInfo> m_FieldMap =
new Dictionary<string, FieldInfo>();
+ public SQLiteEstateStore()
+ {
+ }
+
+ public SQLiteEstateStore(string connectionString)
+ {
+ Initialise(connectionString);
+ }
+
public void Initialise(string connectionString)
{
m_connectionString = connectionString;
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
index e9c6aa5..2dde926 100644
--- a/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
@@ -69,6 +69,15 @@ namespace OpenSim.Data.SQLiteLegacy
private String m_connectionString;
+ public SQLiteSimulationData()
+ {
+ }
+
+ public SQLiteSimulationData(string connectionString)
+ {
+ Initialise(connectionString);
+ }
+
// Temporary attribute while this is experimental
/***********************************************************************
--
cgit v1.1