aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorMike Mazur2008-07-23 03:08:31 +0000
committerMike Mazur2008-07-23 03:08:31 +0000
commita0930aa80d6f43d1dc1b4de0ee5708888cc45a5a (patch)
tree5fabd9a5104c256a874ebfc280b912e46364be50 /OpenSim/Data
parentFirst version of position mapping between LSL <-> C# implemented. (diff)
downloadopensim-SC_OLD-a0930aa80d6f43d1dc1b4de0ee5708888cc45a5a.zip
opensim-SC_OLD-a0930aa80d6f43d1dc1b4de0ee5708888cc45a5a.tar.gz
opensim-SC_OLD-a0930aa80d6f43d1dc1b4de0ee5708888cc45a5a.tar.bz2
opensim-SC_OLD-a0930aa80d6f43d1dc1b4de0ee5708888cc45a5a.tar.xz
Thanks, sempuki, for a patch that moves control of Mono.Addins from source attributes to external XML files. Fix issues 1682 and 1786.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/IGridData.cs8
-rw-r--r--OpenSim/Data/ILogData.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLGridData.cs5
-rw-r--r--OpenSim/Data/MSSQL/MSSQLLogData.cs6
-rw-r--r--OpenSim/Data/MySQL/MySQLGridData.cs5
-rw-r--r--OpenSim/Data/MySQL/MySQLLogData.cs6
-rw-r--r--OpenSim/Data/SQLite/SQLiteGridData.cs5
7 files changed, 2 insertions, 35 deletions
diff --git a/OpenSim/Data/IGridData.cs b/OpenSim/Data/IGridData.cs
index fa24d82..146288f 100644
--- a/OpenSim/Data/IGridData.cs
+++ b/OpenSim/Data/IGridData.cs
@@ -26,11 +26,8 @@
26 */ 26 */
27 27
28using libsecondlife; 28using libsecondlife;
29using Mono.Addins;
30using OpenSim.Framework; 29using OpenSim.Framework;
31 30
32[assembly : AddinRoot("OpenSim.Data", "0.5")]
33
34namespace OpenSim.Data 31namespace OpenSim.Data
35{ 32{
36 public enum DataResponse 33 public enum DataResponse
@@ -44,7 +41,6 @@ namespace OpenSim.Data
44 /// <summary> 41 /// <summary>
45 /// A standard grid interface 42 /// A standard grid interface
46 /// </summary> 43 /// </summary>
47 [TypeExtensionPoint("/OpenSim/GridDataStore")]
48 public interface IGridDataPlugin : IPlugin 44 public interface IGridDataPlugin : IPlugin
49 { 45 {
50 /// <summary> 46 /// <summary>
@@ -105,10 +101,10 @@ namespace OpenSim.Data
105 ReservationData GetReservationAtPoint(uint x, uint y); 101 ReservationData GetReservationAtPoint(uint x, uint y);
106 } 102 }
107 103
108 public class GridDataStoreInitialiser : PluginInitialiserBase 104 public class GridDataInitialiser : PluginInitialiserBase
109 { 105 {
110 private string connect; 106 private string connect;
111 public GridDataStoreInitialiser (string s) { connect = s; } 107 public GridDataInitialiser (string s) { connect = s; }
112 public override void Initialise (IPlugin plugin) 108 public override void Initialise (IPlugin plugin)
113 { 109 {
114 IGridDataPlugin p = plugin as IGridDataPlugin; 110 IGridDataPlugin p = plugin as IGridDataPlugin;
diff --git a/OpenSim/Data/ILogData.cs b/OpenSim/Data/ILogData.cs
index 34657dc..cfbee88 100644
--- a/OpenSim/Data/ILogData.cs
+++ b/OpenSim/Data/ILogData.cs
@@ -25,7 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using Mono.Addins;
29using OpenSim.Framework; 28using OpenSim.Framework;
30 29
31namespace OpenSim.Data 30namespace OpenSim.Data
@@ -64,7 +63,6 @@ namespace OpenSim.Data
64 /// <summary> 63 /// <summary>
65 /// An interface to a LogData storage system 64 /// An interface to a LogData storage system
66 /// </summary> 65 /// </summary>
67 [TypeExtensionPoint("/OpenSim/GridLogData")]
68 public interface ILogDataPlugin : IPlugin 66 public interface ILogDataPlugin : IPlugin
69 { 67 {
70 void saveLog(string serverDaemon, string target, string methodCall, string arguments, int priority, 68 void saveLog(string serverDaemon, string target, string methodCall, string arguments, int priority,
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
index 7de77d1..e1de297 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs
@@ -33,18 +33,13 @@ using System.Security.Cryptography;
33using System.Text; 33using System.Text;
34using libsecondlife; 34using libsecondlife;
35using log4net; 35using log4net;
36using Mono.Addins;
37using OpenSim.Framework; 36using OpenSim.Framework;
38 37
39[assembly : Addin]
40[assembly : AddinDependency("OpenSim.Data", "0.5")]
41
42namespace OpenSim.Data.MSSQL 38namespace OpenSim.Data.MSSQL
43{ 39{
44 /// <summary> 40 /// <summary>
45 /// A grid data interface for MSSQL Server 41 /// A grid data interface for MSSQL Server
46 /// </summary> 42 /// </summary>
47 [Extension("/OpenSim/GridDataStore")]
48 public class MSSQLGridData : GridDataBase 43 public class MSSQLGridData : GridDataBase
49 { 44 {
50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Data/MSSQL/MSSQLLogData.cs b/OpenSim/Data/MSSQL/MSSQLLogData.cs
index d0d81b6..d260e8c 100644
--- a/OpenSim/Data/MSSQL/MSSQLLogData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLLogData.cs
@@ -30,19 +30,13 @@ using System.Reflection;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Data; 31using System.Data;
32using log4net; 32using log4net;
33using Mono.Addins;
34using OpenSim.Framework; 33using OpenSim.Framework;
35 34
36// Only one attribute per assembly. See: *GridData.cs
37// [assembly : Addin]
38// [assembly : AddinDependency("OpenSim.Data", "0.5")]
39
40namespace OpenSim.Data.MSSQL 35namespace OpenSim.Data.MSSQL
41{ 36{
42 /// <summary> 37 /// <summary>
43 /// An interface to the log database for MSSQL 38 /// An interface to the log database for MSSQL
44 /// </summary> 39 /// </summary>
45 [Extension("/OpenSim/GridLogData")]
46 internal class MSSQLLogData : ILogDataPlugin 40 internal class MSSQLLogData : ILogDataPlugin
47 { 41 {
48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index 8142c74..fee457a 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -33,18 +33,13 @@ using System.Security.Cryptography;
33using System.Text; 33using System.Text;
34using libsecondlife; 34using libsecondlife;
35using log4net; 35using log4net;
36using Mono.Addins;
37using OpenSim.Framework; 36using OpenSim.Framework;
38 37
39[assembly : Addin]
40[assembly : AddinDependency("OpenSim.Data", "0.5")]
41
42namespace OpenSim.Data.MySQL 38namespace OpenSim.Data.MySQL
43{ 39{
44 /// <summary> 40 /// <summary>
45 /// A MySQL Interface for the Grid Server 41 /// A MySQL Interface for the Grid Server
46 /// </summary> 42 /// </summary>
47 [Extension("/OpenSim/GridDataStore")]
48 public class MySQLGridData : GridDataBase 43 public class MySQLGridData : GridDataBase
49 { 44 {
50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs
index f11aec5..456cfd2 100644
--- a/OpenSim/Data/MySQL/MySQLLogData.cs
+++ b/OpenSim/Data/MySQL/MySQLLogData.cs
@@ -28,19 +28,13 @@ using System;
28using System.Reflection; 28using System.Reflection;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using log4net; 30using log4net;
31using Mono.Addins;
32using OpenSim.Framework; 31using OpenSim.Framework;
33 32
34// Only one attribute per assembly. See: *GridData.cs
35// [assembly : Addin]
36// [assembly : AddinDependency("OpenSim.Data", "0.5")]
37
38namespace OpenSim.Data.MySQL 33namespace OpenSim.Data.MySQL
39{ 34{
40 /// <summary> 35 /// <summary>
41 /// An interface to the log database for MySQL 36 /// An interface to the log database for MySQL
42 /// </summary> 37 /// </summary>
43 [Extension("/OpenSim/GridLogData")]
44 internal class MySQLLogData : ILogDataPlugin 38 internal class MySQLLogData : ILogDataPlugin
45 { 39 {
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index 1e07458..8c4574e 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -33,18 +33,13 @@ using System.Security.Cryptography;
33using System.Text; 33using System.Text;
34using libsecondlife; 34using libsecondlife;
35using log4net; 35using log4net;
36using Mono.Addins;
37using OpenSim.Framework; 36using OpenSim.Framework;
38 37
39[assembly : Addin]
40[assembly : AddinDependency("OpenSim.Data", "0.5")]
41
42namespace OpenSim.Data.SQLite 38namespace OpenSim.Data.SQLite
43{ 39{
44 /// <summary> 40 /// <summary>
45 /// A Grid Interface to the SQLite database 41 /// A Grid Interface to the SQLite database
46 /// </summary> 42 /// </summary>
47 [Extension("/OpenSim/GridDataStore")]
48 public class SQLiteGridData : GridDataBase 43 public class SQLiteGridData : GridDataBase
49 { 44 {
50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);