Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

author: Melanie 2010-04-30 19:29:21 +0100
committer: Melanie 2010-04-30 19:29:21 +0100
commit: 23282935f1f25fd44d85193f3c13ea97c755f75c (patch)
tree: 689d44f5657dd36e74c3b4d4dd508c86ee90cea1 /OpenSim/Data/SQLite/SQLiteUtils.cs
parent: Fix a null ref from trying to access a dictionary that was never initialized. (diff)
parent: * XInventory fairly tested, including for HG. Almost ready to switch. (diff)
download: opensim-SC_OLD-23282935f1f25fd44d85193f3c13ea97c755f75c.zip
opensim-SC_OLD-23282935f1f25fd44d85193f3c13ea97c755f75c.tar.gz
opensim-SC_OLD-23282935f1f25fd44d85193f3c13ea97c755f75c.tar.bz2
opensim-SC_OLD-23282935f1f25fd44d85193f3c13ea97c755f75c.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteUtils.cs b/OpenSim/Data/SQLite/SQLiteUtils.cs
index 4a835ce..07c6b69 100644
--- a/OpenSim/Data/SQLite/SQLiteUtils.cs
+++ b/OpenSim/Data/SQLite/SQLiteUtils.cs
@@ -27,7 +27,7 @@
 using System;
 using System.Data;
-using Mono.Data.SqliteClient;
+using Mono.Data.Sqlite;
 namespace OpenSim.Data.SQLite
 {
author	Melanie	2010-04-30 19:29:21 +0100
committer	Melanie	2010-04-30 19:29:21 +0100
commit	23282935f1f25fd44d85193f3c13ea97c755f75c (patch)
tree	689d44f5657dd36e74c3b4d4dd508c86ee90cea1 /OpenSim/Data/SQLite/SQLiteUtils.cs
parent	Fix a null ref from trying to access a dictionary that was never initialized. (diff)
parent	* XInventory fairly tested, including for HG. Almost ready to switch. (diff)
download	opensim-SC_OLD-23282935f1f25fd44d85193f3c13ea97c755f75c.zip opensim-SC_OLD-23282935f1f25fd44d85193f3c13ea97c755f75c.tar.gz opensim-SC_OLD-23282935f1f25fd44d85193f3c13ea97c755f75c.tar.bz2 opensim-SC_OLD-23282935f1f25fd44d85193f3c13ea97c755f75c.tar.xz

diff --git a/OpenSim/Data/SQLite/SQLiteUtils.cs b/OpenSim/Data/SQLite/SQLiteUtils.cs index 4a835ce..07c6b69 100644 --- a/OpenSim/Data/SQLite/SQLiteUtils.cs +++ b/OpenSim/Data/SQLite/SQLiteUtils.cs
@@ -27,7 +27,7 @@
27		27
28	using System;	28	using System;
29	using System.Data;	29	using System.Data;
30	using Mono.Data.SqliteClient;	30	using Mono.Data.Sqlite;
31		31
32	namespace OpenSim.Data.SQLite	32	namespace OpenSim.Data.SQLite
33	{	33	{