diff options
| author | Justin Clark-Casey (justincc) | 2010-09-25 00:00:00 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-25 00:00:00 +0100 |
| commit | b366ad5012e6c6be5de2b1449a7b2e94332ef6e3 (patch) | |
| tree | e04030a305e9ca92179deb89b641f4968acee6c1 /OpenSim/Data/SQLite/SQLiteSimulationData.cs | |
| parent | If the uuid gatherer fails to find the asset containing gesture metadata, the... (diff) | |
| parent | Added delay for llSetPrimitiveParams() and llSetLinkPrimitiveParams() functio... (diff) | |
| download | opensim-SC_OLD-b366ad5012e6c6be5de2b1449a7b2e94332ef6e3.zip opensim-SC_OLD-b366ad5012e6c6be5de2b1449a7b2e94332ef6e3.tar.gz opensim-SC_OLD-b366ad5012e6c6be5de2b1449a7b2e94332ef6e3.tar.bz2 opensim-SC_OLD-b366ad5012e6c6be5de2b1449a7b2e94332ef6e3.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteSimulationData.cs')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index ebe6da8..9d49fb6 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
| @@ -32,7 +32,11 @@ using System.Drawing; | |||
| 32 | using System.IO; | 32 | using System.IO; |
| 33 | using System.Reflection; | 33 | using System.Reflection; |
| 34 | using log4net; | 34 | using log4net; |
| 35 | using Mono.Data.Sqlite; | 35 | #if CSharpSqlite |
| 36 | using Community.CsharpSqlite.Sqlite; | ||
| 37 | #else | ||
| 38 | using Mono.Data.Sqlite; | ||
| 39 | #endif | ||
| 36 | using OpenMetaverse; | 40 | using OpenMetaverse; |
| 37 | using OpenMetaverse.StructuredData; | 41 | using OpenMetaverse.StructuredData; |
| 38 | using OpenSim.Framework; | 42 | using OpenSim.Framework; |