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/SQLiteGenericTableHandler.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/SQLiteGenericTableHandler.cs | 6 |
1 files changed, 5 insertions, 1 deletions
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; | |||
| 30 | using System.Data; | 30 | using System.Data; |
| 31 | using System.Reflection; | 31 | using System.Reflection; |
| 32 | using log4net; | 32 | using log4net; |
| 33 | using Mono.Data.Sqlite; | 33 | #if CSharpSqlite |
| 34 | using Community.CsharpSqlite.Sqlite; | ||
| 35 | #else | ||
| 36 | using Mono.Data.Sqlite; | ||
| 37 | #endif | ||
| 34 | using OpenMetaverse; | 38 | using OpenMetaverse; |
| 35 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
| 36 | using OpenSim.Region.Framework.Interfaces; | 40 | using OpenSim.Region.Framework.Interfaces; |