diff options
| author | Melanie | 2010-09-25 06:19:26 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-25 06:19:26 +0100 |
| commit | 4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd (patch) | |
| tree | 1e69a75f208cc7065bdd196bb99d13adfb5003b5 /OpenSim/Data/SQLite/SQLiteUtils.cs | |
| parent | Experimental locking of taint processing (diff) | |
| parent | Fix a minor economy issue (diff) | |
| download | opensim-SC_OLD-4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd.zip opensim-SC_OLD-4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd.tar.gz opensim-SC_OLD-4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd.tar.bz2 opensim-SC_OLD-4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteUtils.cs | 6 |
1 files changed, 5 insertions, 1 deletions
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 | ||
| 28 | using System; | 28 | using System; |
| 29 | using System.Data; | 29 | using System.Data; |
| 30 | using Mono.Data.Sqlite; | 30 | #if CSharpSqlite |
| 31 | using Community.CsharpSqlite.Sqlite; | ||
| 32 | #else | ||
| 33 | using Mono.Data.Sqlite; | ||
| 34 | #endif | ||
| 31 | 35 | ||
| 32 | namespace OpenSim.Data.SQLite | 36 | namespace OpenSim.Data.SQLite |
| 33 | { | 37 | { |