Merge branch 'master' into connector_plugin

Conflicts:
	OpenSim/Server/Base/ServicesServerBase.cs

1 files changed, 2 insertions, 1 deletions

diff --git a/OpenSim/Data/Tests/BasicDataServiceTest.cs b/OpenSim/Data/Tests/BasicDataServiceTest.cs
index 7d85f0c..d8019ba 100644
--- a/OpenSim/Data/Tests/BasicDataServiceTest.cs
+++ b/OpenSim/Data/Tests/BasicDataServiceTest.cs
@@ -33,6 +33,7 @@ using NUnit.Framework;
 using NUnit.Framework.Constraints;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Tests.Common;
 using log4net;
 using System.Data;
 using System.Data.Common;
@@ -45,7 +46,7 @@ namespace OpenSim.Data.Tests
     /// </summary>
     /// <typeparam name="TConn"></typeparam>
     /// <typeparam name="TService"></typeparam>
-    public class BasicDataServiceTest<TConn, TService>
+    public class BasicDataServiceTest<TConn, TService> : OpenSimTestCase
         where TConn : DbConnection, new()
         where TService : class, new()
     {