aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs7
-rw-r--r--OpenSim/Data/SQLite/SQLiteAuthenticationData.cs7
-rw-r--r--OpenSim/Data/SQLite/SQLiteAvatarData.cs6
-rw-r--r--OpenSim/Data/SQLite/SQLiteEstateData.cs6
-rw-r--r--OpenSim/Data/SQLite/SQLiteFramework.cs6
-rw-r--r--OpenSim/Data/SQLite/SQLiteFriendsData.cs6
-rw-r--r--OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs6
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs6
-rw-r--r--OpenSim/Data/SQLite/SQLiteSimulationData.cs6
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserAccountData.cs6
-rw-r--r--OpenSim/Data/SQLite/SQLiteUtils.cs6
-rw-r--r--OpenSim/Data/SQLite/SQLiteXInventoryData.cs6
-rw-r--r--prebuild.xml2
13 files changed, 64 insertions, 12 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 16e560c..5b71897 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -30,7 +30,12 @@ using System.Data;
30using System.Reflection; 30using System.Reflection;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using log4net; 32using log4net;
33using Mono.Data.Sqlite; 33#if CSharpSqlite
34 using Community.CsharpSqlite.Sqlite;
35#else
36 using Mono.Data.Sqlite;
37#endif
38
34using OpenMetaverse; 39using OpenMetaverse;
35using OpenSim.Framework; 40using OpenSim.Framework;
36 41
diff --git a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
index a1412ff..c54bd74 100644
--- a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
@@ -33,7 +33,12 @@ using System.Reflection;
33using log4net; 33using log4net;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using Mono.Data.Sqlite; 36using log4net;
37#if CSharpSqlite
38 using Community.CsharpSqlite.Sqlite;
39#else
40 using Mono.Data.Sqlite;
41#endif
37 42
38namespace OpenSim.Data.SQLite 43namespace OpenSim.Data.SQLite
39{ 44{
diff --git a/OpenSim/Data/SQLite/SQLiteAvatarData.cs b/OpenSim/Data/SQLite/SQLiteAvatarData.cs
index c093884..60a1a3e 100644
--- a/OpenSim/Data/SQLite/SQLiteAvatarData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAvatarData.cs
@@ -33,7 +33,11 @@ using System.Threading;
33using log4net; 33using log4net;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using Mono.Data.Sqlite; 36#if CSharpSqlite
37 using Community.CsharpSqlite.Sqlite;
38#else
39 using Mono.Data.Sqlite;
40#endif
37 41
38namespace OpenSim.Data.SQLite 42namespace OpenSim.Data.SQLite
39{ 43{
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index d1d67eb..21556da 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -30,7 +30,11 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using log4net; 32using log4net;
33using Mono.Data.Sqlite; 33#if CSharpSqlite
34 using Community.CsharpSqlite.Sqlite;
35#else
36 using Mono.Data.Sqlite;
37#endif
34using OpenMetaverse; 38using OpenMetaverse;
35using OpenSim.Framework; 39using OpenSim.Framework;
36using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
diff --git a/OpenSim/Data/SQLite/SQLiteFramework.cs b/OpenSim/Data/SQLite/SQLiteFramework.cs
index cf114d1..4992bcc 100644
--- a/OpenSim/Data/SQLite/SQLiteFramework.cs
+++ b/OpenSim/Data/SQLite/SQLiteFramework.cs
@@ -31,7 +31,11 @@ using System.Collections.Generic;
31using System.Data; 31using System.Data;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using Mono.Data.Sqlite; 34#if CSharpSqlite
35 using Community.CsharpSqlite.Sqlite;
36#else
37 using Mono.Data.Sqlite;
38#endif
35 39
36namespace OpenSim.Data.SQLite 40namespace OpenSim.Data.SQLite
37{ 41{
diff --git a/OpenSim/Data/SQLite/SQLiteFriendsData.cs b/OpenSim/Data/SQLite/SQLiteFriendsData.cs
index b06853c..4bfd228 100644
--- a/OpenSim/Data/SQLite/SQLiteFriendsData.cs
+++ b/OpenSim/Data/SQLite/SQLiteFriendsData.cs
@@ -31,7 +31,11 @@ using System.Collections.Generic;
31using System.Data; 31using System.Data;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using Mono.Data.Sqlite; 34#if CSharpSqlite
35 using Community.CsharpSqlite.Sqlite;
36#else
37 using Mono.Data.Sqlite;
38#endif
35 39
36namespace OpenSim.Data.SQLite 40namespace OpenSim.Data.SQLite
37{ 41{
diff --git a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
index 9b8e2fa..0d7b001 100644
--- a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
+++ b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
@@ -30,7 +30,11 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using log4net; 32using log4net;
33using Mono.Data.Sqlite; 33#if CSharpSqlite
34 using Community.CsharpSqlite.Sqlite;
35#else
36 using Mono.Data.Sqlite;
37#endif
34using OpenMetaverse; 38using OpenMetaverse;
35using OpenSim.Framework; 39using OpenSim.Framework;
36using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index ecf8e02..d606f11 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -30,7 +30,11 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using log4net; 32using log4net;
33using Mono.Data.Sqlite; 33#if CSharpSqlite
34 using Community.CsharpSqlite.Sqlite;
35#else
36 using Mono.Data.Sqlite;
37#endif
34using OpenMetaverse; 38using OpenMetaverse;
35using OpenSim.Framework; 39using OpenSim.Framework;
36 40
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index ebe6da8..9d49fb6 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -32,7 +32,11 @@ using System.Drawing;
32using System.IO; 32using System.IO;
33using System.Reflection; 33using System.Reflection;
34using log4net; 34using log4net;
35using Mono.Data.Sqlite; 35#if CSharpSqlite
36 using Community.CsharpSqlite.Sqlite;
37#else
38 using Mono.Data.Sqlite;
39#endif
36using OpenMetaverse; 40using OpenMetaverse;
37using OpenMetaverse.StructuredData; 41using OpenMetaverse.StructuredData;
38using OpenSim.Framework; 42using OpenSim.Framework;
diff --git a/OpenSim/Data/SQLite/SQLiteUserAccountData.cs b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
index 2706aea..7a5de50 100644
--- a/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
@@ -31,7 +31,11 @@ using System.Collections.Generic;
31using System.Data; 31using System.Data;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using Mono.Data.Sqlite; 34#if CSharpSqlite
35 using Community.CsharpSqlite.Sqlite;
36#else
37 using Mono.Data.Sqlite;
38#endif
35 39
36namespace OpenSim.Data.SQLite 40namespace OpenSim.Data.SQLite
37{ 41{
diff --git a/OpenSim/Data/SQLite/SQLiteUtils.cs b/OpenSim/Data/SQLite/SQLiteUtils.cs
index 07c6b69..ca5861f 100644
--- a/OpenSim/Data/SQLite/SQLiteUtils.cs
+++ b/OpenSim/Data/SQLite/SQLiteUtils.cs
@@ -27,7 +27,11 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using Mono.Data.Sqlite; 30#if CSharpSqlite
31 using Community.CsharpSqlite.Sqlite;
32#else
33 using Mono.Data.Sqlite;
34#endif
31 35
32namespace OpenSim.Data.SQLite 36namespace OpenSim.Data.SQLite
33{ 37{
diff --git a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
index ca651e1..ccbd86e 100644
--- a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
+++ b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
@@ -29,7 +29,11 @@ using System;
29using System.Data; 29using System.Data;
30using System.Reflection; 30using System.Reflection;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using Mono.Data.Sqlite; 32#if CSharpSqlite
33 using Community.CsharpSqlite.Sqlite;
34#else
35 using Mono.Data.Sqlite;
36#endif
33using log4net; 37using log4net;
34using OpenMetaverse; 38using OpenMetaverse;
35using OpenSim.Framework; 39using OpenSim.Framework;
diff --git a/prebuild.xml b/prebuild.xml
index 726991c..530c417 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2217,6 +2217,8 @@
2217 <Reference name="OpenMetaverseTypes" path="../../../bin/"/> 2217 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
2218 <Reference name="OpenMetaverse" path="../../../bin/"/> 2218 <Reference name="OpenMetaverse" path="../../../bin/"/>
2219 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> 2219 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
2220 <Reference name="Community.CsharpSqlite"/>
2221 <Reference name="Community.CsharpSqlite.Sqlite"/>
2220 <Reference name="Mono.Data.Sqlite"/> 2222 <Reference name="Mono.Data.Sqlite"/>
2221 <Reference name="Mono.Addins" path="../../../bin/"/> 2223 <Reference name="Mono.Addins" path="../../../bin/"/>
2222 <Reference name="log4net" path="../../../bin/"/> 2224 <Reference name="log4net" path="../../../bin/"/>