diff options
author | Teravus Ovares (Dan Olivares) | 2010-09-23 01:21:08 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2010-09-23 01:21:08 -0400 |
commit | 983c6a74b15f566a9d2290b545f2b56b74f05f58 (patch) | |
tree | 1cc5495bbacc8bf844c20176746fa0ae05061814 /OpenSim/Data/SQLite/SQLiteXInventoryData.cs | |
parent | * Pushing the Community.CSharpSqlite.Sqlite dll's I built. This is a slight... (diff) | |
download | opensim-SC-983c6a74b15f566a9d2290b545f2b56b74f05f58.zip opensim-SC-983c6a74b15f566a9d2290b545f2b56b74f05f58.tar.gz opensim-SC-983c6a74b15f566a9d2290b545f2b56b74f05f58.tar.bz2 opensim-SC-983c6a74b15f566a9d2290b545f2b56b74f05f58.tar.xz |
* Add CSharpSqlite to prebuild
* Use a conditional define to determine whether we're using CSharpSqlite or Mono.Data.Sqlite
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
* Hopefully, this will restore sqlite functionality on a Mac. In visual studio, you can edit the OpenSim.Data.SQLite project, go to the Build tab and enter CSharpSqlite in the box. I'm not sure how to define CSharpSqlite in Mono, someone better at it then me will have to take the job of figuring out the best way to define it in Mono.
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteXInventoryData.cs')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteXInventoryData.cs | 6 |
1 files changed, 5 insertions, 1 deletions
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; | |||
29 | using System.Data; | 29 | using System.Data; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
32 | using Mono.Data.Sqlite; | 32 | #if CSharpSqlite |
33 | using Community.CsharpSqlite.Sqlite; | ||
34 | #else | ||
35 | using Mono.Data.Sqlite; | ||
36 | #endif | ||
33 | using log4net; | 37 | using log4net; |
34 | using OpenMetaverse; | 38 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |