Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-09-25 06:19:26 +01:00
23 changed files with 231 additions and 157 deletions

View File

@@ -30,7 +30,12 @@ using System.Data;
using System.Reflection;
using System.Collections.Generic;
using log4net;
using Mono.Data.Sqlite;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using OpenMetaverse;
using OpenSim.Framework;