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/SQLiteAuthenticationData.cs | |
| parent | Experimental locking of taint processing (diff) | |
| parent | Fix a minor economy issue (diff) | |
| download | opensim-SC-4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd.zip opensim-SC-4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd.tar.gz opensim-SC-4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd.tar.bz2 opensim-SC-4fbdcb95a078d8a7b9c90bb3d3b56f955512bccd.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteAuthenticationData.cs')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteAuthenticationData.cs | 7 |
1 files changed, 6 insertions, 1 deletions
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; | |||
| 33 | using log4net; | 33 | using log4net; |
| 34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
| 35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
| 36 | using Mono.Data.Sqlite; | 36 | using log4net; |
| 37 | #if CSharpSqlite | ||
| 38 | using Community.CsharpSqlite.Sqlite; | ||
| 39 | #else | ||
| 40 | using Mono.Data.Sqlite; | ||
| 41 | #endif | ||
| 37 | 42 | ||
| 38 | namespace OpenSim.Data.SQLite | 43 | namespace OpenSim.Data.SQLite |
| 39 | { | 44 | { |