ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-09-25 06:19:26 +01:00
parent 83b16612ce 3b76d7bbb6
commit 4fbdcb95a0
23 changed files with 231 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Data/SQLite/SQLiteAssetData.cs
View File

@@ -30,7 +30,12 @@ using System.Data;
using System.Reflection;
using System.Collections.Generic;
using log4net;
using Mono.Data.Sqlite;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using OpenMetaverse;
using OpenSim.Framework;

7
OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
View File

@@ -33,7 +33,12 @@ using System.Reflection;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
using Mono.Data.Sqlite;
using log4net;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
namespace OpenSim.Data.SQLite
{

6
OpenSim/Data/SQLite/SQLiteAvatarData.cs
View File

@@ -33,7 +33,11 @@ using System.Threading;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
using Mono.Data.Sqlite;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
namespace OpenSim.Data.SQLite
{

19
OpenSim/Data/SQLite/SQLiteEstateData.cs
View File

@@ -30,7 +30,11 @@ using System.Collections.Generic;
using System.Data;
using System.Reflection;
using log4net;
using Mono.Data.Sqlite;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
@@ -105,10 +109,17 @@ namespace OpenSim.Data.SQLite
{
EstateSettings es = new EstateSettings();
es.OnSave += StoreEstateSettings;
IDataReader r = null;
try
{
r = cmd.ExecuteReader();
}
catch (SqliteException)
{
m_log.Error("[SQLITE]: There was an issue loading the estate settings. This can happen the first time running OpenSimulator with CSharpSqlite the first time. OpenSimulator will probably crash, restart it and it should be good to go.");
}
IDataReader r = cmd.ExecuteReader();
if (r.Read())
if (r != null && r.Read())
{
foreach (string name in FieldList)
{

6
OpenSim/Data/SQLite/SQLiteFramework.cs
View File

@@ -31,7 +31,11 @@ using System.Collections.Generic;
using System.Data;
using OpenMetaverse;
using OpenSim.Framework;
using Mono.Data.Sqlite;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
namespace OpenSim.Data.SQLite
{

6
OpenSim/Data/SQLite/SQLiteFriendsData.cs
View File

@@ -31,7 +31,11 @@ using System.Collections.Generic;
using System.Data;
using OpenMetaverse;
using OpenSim.Framework;
using Mono.Data.Sqlite;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
namespace OpenSim.Data.SQLite
{

6
OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
View File

@@ -30,7 +30,11 @@ using System.Collections.Generic;
using System.Data;
using System.Reflection;
using log4net;
using Mono.Data.Sqlite;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;

6
OpenSim/Data/SQLite/SQLiteInventoryStore.cs
View File

@@ -30,7 +30,11 @@ using System.Collections.Generic;
using System.Data;
using System.Reflection;
using log4net;
using Mono.Data.Sqlite;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using OpenMetaverse;
using OpenSim.Framework;

6
OpenSim/Data/SQLite/SQLiteSimulationData.cs
View File

@@ -32,7 +32,11 @@ using System.Drawing;
using System.IO;
using System.Reflection;
using log4net;
using Mono.Data.Sqlite;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using OpenSim.Framework;

6
OpenSim/Data/SQLite/SQLiteUserAccountData.cs
View File

@@ -31,7 +31,11 @@ using System.Collections.Generic;
using System.Data;
using OpenMetaverse;
using OpenSim.Framework;
using Mono.Data.Sqlite;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
namespace OpenSim.Data.SQLite
{

6
OpenSim/Data/SQLite/SQLiteUtils.cs
View File

@@ -27,7 +27,11 @@
using System;
using System.Data;
using Mono.Data.Sqlite;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
namespace OpenSim.Data.SQLite
{

6
OpenSim/Data/SQLite/SQLiteXInventoryData.cs
View File

@@ -29,7 +29,11 @@ using System;
using System.Data;
using System.Reflection;
using System.Collections.Generic;
using Mono.Data.Sqlite;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using log4net;
using OpenMetaverse;
using OpenSim.Framework;