diff options
author | Melanie | 2010-04-30 20:15:19 +0100 |
---|---|---|
committer | Melanie | 2010-04-30 20:15:19 +0100 |
commit | 9bc5098dd8cac09caab5d50045aba13110ead2c6 (patch) | |
tree | a8c197c950b14234873e66bd199178907983c302 /OpenSim/Data/SQLite/SQLiteXInventoryData.cs | |
parent | Fix linking issue introduced in my earlier commit (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-9bc5098dd8cac09caab5d50045aba13110ead2c6.zip opensim-SC-9bc5098dd8cac09caab5d50045aba13110ead2c6.tar.gz opensim-SC-9bc5098dd8cac09caab5d50045aba13110ead2c6.tar.bz2 opensim-SC-9bc5098dd8cac09caab5d50045aba13110ead2c6.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteXInventoryData.cs')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteXInventoryData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs index a66e0c6..be1d041 100644 --- a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs +++ b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Data; | 29 | using System.Data; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
32 | using Mono.Data.SqliteClient; | 32 | using Mono.Data.Sqlite; |
33 | using log4net; | 33 | using log4net; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
@@ -147,7 +147,7 @@ namespace OpenSim.Data.SQLite | |||
147 | } | 147 | } |
148 | 148 | ||
149 | reader.Close(); | 149 | reader.Close(); |
150 | CloseCommand(cmd); | 150 | //CloseCommand(cmd); |
151 | 151 | ||
152 | return perms; | 152 | return perms; |
153 | } | 153 | } |