From c3594ba7d19c268db1275b6cf3491ba50d6c5790 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 21 Jan 2008 18:39:54 +0000
Subject: * Following on from sdague's r3144, commenting out other parts of
 TribalMedia * This should resolve the current build problem

---
 OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs     | 2 ++
 OpenSim/Framework/Data/OpenSimDataReader.cs             | 3 +++
 OpenSim/Framework/Data/OpenSimDatabaseConnector.cs      | 2 ++
 OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs      | 2 ++
 OpenSim/Framework/Data/OpenSimTableMapper.cs            | 2 ++
 OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs | 4 +++-
 6 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs b/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs
index ffaaecb..275ce47 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs
@@ -2,6 +2,7 @@ using System.Data.Common;
 using MySql.Data.MySqlClient;
 // using TribalMedia.Framework.Data;
 
+/*
 namespace OpenSim.Framework.Data.MySQL
 {
     public class MySQLDatabaseMapper : OpenSimDatabaseConnector
@@ -23,3 +24,4 @@ namespace OpenSim.Framework.Data.MySQL
         }
     }
 }
+*/
diff --git a/OpenSim/Framework/Data/OpenSimDataReader.cs b/OpenSim/Framework/Data/OpenSimDataReader.cs
index 518cdc9..c7b6470 100644
--- a/OpenSim/Framework/Data/OpenSimDataReader.cs
+++ b/OpenSim/Framework/Data/OpenSimDataReader.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Text;
 using libsecondlife;
+
+/*
 using TribalMedia.Framework.Data;
 
 namespace OpenSim.Framework.Data
@@ -37,3 +39,4 @@ namespace OpenSim.Framework.Data
         }
     }
 }
+*/
diff --git a/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs b/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
index ec80488..155bdc1 100644
--- a/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
+++ b/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
@@ -1,5 +1,6 @@
 using System.Data;
 using libsecondlife;
+/*
 using TribalMedia.Framework.Data;
 
 namespace OpenSim.Framework.Data
@@ -26,3 +27,4 @@ namespace OpenSim.Framework.Data
         }
     }
 }
+*/
diff --git a/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs b/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs
index 103de2d..8d5b9cf 100644
--- a/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs
+++ b/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Data.Common;
 using System.Text;
 using libsecondlife;
+/*
 using TribalMedia.Framework.Data;
 
 namespace OpenSim.Framework.Data
@@ -72,3 +73,4 @@ namespace OpenSim.Framework.Data
         }      
     }
 }
+*/
diff --git a/OpenSim/Framework/Data/OpenSimTableMapper.cs b/OpenSim/Framework/Data/OpenSimTableMapper.cs
index 744f062..f596b45 100644
--- a/OpenSim/Framework/Data/OpenSimTableMapper.cs
+++ b/OpenSim/Framework/Data/OpenSimTableMapper.cs
@@ -1,4 +1,5 @@
 using System.Data;
+/*
 using TribalMedia.Framework.Data;
 
 namespace OpenSim.Framework.Data
@@ -10,3 +11,4 @@ namespace OpenSim.Framework.Data
         }
     }
 }
+*/
diff --git a/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs b/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs
index c915538..227a98e 100644
--- a/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs
+++ b/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs
@@ -1,8 +1,9 @@
 using System;
 using OpenSim.Framework;
-using TribalMedia.Framework.Data;
+//using TribalMedia.Framework.Data;
 using libsecondlife;
 
+/*
 namespace OpenSim.Framework.Data
 {
     public class PrimitiveBaseShapeRowMapper : BaseRowMapper<PrimitiveBaseShape>
@@ -141,3 +142,4 @@ namespace OpenSim.Framework.Data
         }
     }
 }
+*/
-- 
cgit v1.1