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/SQLiteAssetData.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-b366ad5012e6c6be5de2b1449a7b2e94332ef6e3.zip opensim-SC-b366ad5012e6c6be5de2b1449a7b2e94332ef6e3.tar.gz opensim-SC-b366ad5012e6c6be5de2b1449a7b2e94332ef6e3.tar.bz2 opensim-SC-b366ad5012e6c6be5de2b1449a7b2e94332ef6e3.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteAssetData.cs')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteAssetData.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index 16e560c..5b71897 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs | |||
@@ -30,7 +30,12 @@ using System.Data; | |||
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
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 | ||
38 | |||
34 | using OpenMetaverse; | 39 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 40 | using OpenSim.Framework; |
36 | 41 | ||