4 files changed, 7 insertions, 7 deletions

diff --git a/OpenSim/Framework/Data/OpenSimDatabaseMapper.cs b/OpenSim/Framework/Data/OpenSimDatabaseMapper.cs
index bb82462..4f202bc 100644
--- a/OpenSim/Framework/Data/OpenSimDatabaseMapper.cs
+++ b/OpenSim/Framework/Data/OpenSimDatabaseMapper.cs
@@ -4,7 +4,7 @@ using TribalMedia.Framework.Data;
 
 namespace OpenSim.Framework.Data
 {
-    public abstract class OpenSimDatabaseMapper : DatabaseMapper
+    public abstract class OpenSimDatabaseMapper : BaseDatabaseConnector
     {
         public OpenSimDatabaseMapper(string connectionString) : base(connectionString)
         {
diff --git a/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs b/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs
index 851ebcd..d8c2ddf 100644
--- a/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs
+++ b/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs
@@ -9,7 +9,7 @@ namespace OpenSim.Framework.Data
 {
     public class OpenSimObjectFieldMapper<TObject, TField> : ObjectField<TObject, TField>
     {
-        public OpenSimObjectFieldMapper(TableMapper tableMapper, string fieldName,
+        public OpenSimObjectFieldMapper(BaseTableMapper tableMapper, string fieldName,
                                         ObjectGetAccessor<TObject, TField> rowMapperGetAccessor,
                                         ObjectSetAccessor<TObject, TField> rowMapperSetAccessor)
             : base(tableMapper, fieldName, rowMapperGetAccessor, rowMapperSetAccessor)
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Data
             }
             else
             {
-                base.ExpandField<TObj>(obj, command, fieldNames);
+                base.ExpandField(obj, command, fieldNames);
             }
         }
 
diff --git a/OpenSim/Framework/Data/OpenSimTableMapper.cs b/OpenSim/Framework/Data/OpenSimTableMapper.cs
index c72f523..b6406b6 100644
--- a/OpenSim/Framework/Data/OpenSimTableMapper.cs
+++ b/OpenSim/Framework/Data/OpenSimTableMapper.cs
@@ -3,9 +3,9 @@ using TribalMedia.Framework.Data;
 

 namespace OpenSim.Framework.Data

 {

-    public abstract class OpenSimTableMapper<TRowMapper, TPrimaryKey> : ObjectTableMapper<TRowMapper, TPrimaryKey>

+    public abstract class OpenSimTableMapper<TRowMapper, TPrimaryKey> : BaseTableMapper<TRowMapper, TPrimaryKey>

     {

-        public OpenSimTableMapper(DatabaseMapper database, string tableName) : base(database, tableName)

+        public OpenSimTableMapper(BaseDatabaseConnector database, string tableName) : base(database, tableName)

         {

         }

 

diff --git a/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs b/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs
index c8098ab..af49376 100644
--- a/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs
+++ b/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs
@@ -16,10 +16,10 @@ namespace OpenSim.Framework.Data
 
     public class PrimitiveBaseShapeTableMapper : OpenSimTableMapper<PrimitiveBaseShapeRowMapper, Guid>
     {
-        public PrimitiveBaseShapeTableMapper(DatabaseMapper connection, string tableName)
+        public PrimitiveBaseShapeTableMapper(BaseDatabaseConnector connection, string tableName)
             : base(connection, tableName)
         {
-            RowMapperSchema<PrimitiveBaseShapeRowMapper> rowMapperSchema = new RowMapperSchema<PrimitiveBaseShapeRowMapper>(this);
+            ObjectSchema<PrimitiveBaseShapeRowMapper> rowMapperSchema = new ObjectSchema<PrimitiveBaseShapeRowMapper>(this);
             m_schema = rowMapperSchema;
 
             m_keyFieldMapper = rowMapperSchema.AddMapping<Guid>("SceneObjectPartId",