aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-01-21 18:39:54 +0000
committerJustin Clarke Casey2008-01-21 18:39:54 +0000
commitc3594ba7d19c268db1275b6cf3491ba50d6c5790 (patch)
treeefecd2fdc4fbf3f209f79320a4de1444fe4e756d /OpenSim/Framework
parent* Fix accidental commenting out of OpenSim.Framework.Data (diff)
downloadopensim-SC_OLD-c3594ba7d19c268db1275b6cf3491ba50d6c5790.zip
opensim-SC_OLD-c3594ba7d19c268db1275b6cf3491ba50d6c5790.tar.gz
opensim-SC_OLD-c3594ba7d19c268db1275b6cf3491ba50d6c5790.tar.bz2
opensim-SC_OLD-c3594ba7d19c268db1275b6cf3491ba50d6c5790.tar.xz
* Following on from sdague's r3144, commenting out other parts of TribalMedia
* This should resolve the current build problem
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs2
-rw-r--r--OpenSim/Framework/Data/OpenSimDataReader.cs3
-rw-r--r--OpenSim/Framework/Data/OpenSimDatabaseConnector.cs2
-rw-r--r--OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs2
-rw-r--r--OpenSim/Framework/Data/OpenSimTableMapper.cs2
-rw-r--r--OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs4
6 files changed, 14 insertions, 1 deletions
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;
2using MySql.Data.MySqlClient; 2using MySql.Data.MySqlClient;
3// using TribalMedia.Framework.Data; 3// using TribalMedia.Framework.Data;
4 4
5/*
5namespace OpenSim.Framework.Data.MySQL 6namespace OpenSim.Framework.Data.MySQL
6{ 7{
7 public class MySQLDatabaseMapper : OpenSimDatabaseConnector 8 public class MySQLDatabaseMapper : OpenSimDatabaseConnector
@@ -23,3 +24,4 @@ namespace OpenSim.Framework.Data.MySQL
23 } 24 }
24 } 25 }
25} 26}
27*/
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;
3using System.Data; 3using System.Data;
4using System.Text; 4using System.Text;
5using libsecondlife; 5using libsecondlife;
6
7/*
6using TribalMedia.Framework.Data; 8using TribalMedia.Framework.Data;
7 9
8namespace OpenSim.Framework.Data 10namespace OpenSim.Framework.Data
@@ -37,3 +39,4 @@ namespace OpenSim.Framework.Data
37 } 39 }
38 } 40 }
39} 41}
42*/
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 @@
1using System.Data; 1using System.Data;
2using libsecondlife; 2using libsecondlife;
3/*
3using TribalMedia.Framework.Data; 4using TribalMedia.Framework.Data;
4 5
5namespace OpenSim.Framework.Data 6namespace OpenSim.Framework.Data
@@ -26,3 +27,4 @@ namespace OpenSim.Framework.Data
26 } 27 }
27 } 28 }
28} 29}
30*/
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;
3using System.Data.Common; 3using System.Data.Common;
4using System.Text; 4using System.Text;
5using libsecondlife; 5using libsecondlife;
6/*
6using TribalMedia.Framework.Data; 7using TribalMedia.Framework.Data;
7 8
8namespace OpenSim.Framework.Data 9namespace OpenSim.Framework.Data
@@ -72,3 +73,4 @@ namespace OpenSim.Framework.Data
72 } 73 }
73 } 74 }
74} 75}
76*/
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 @@
1using System.Data; 1using System.Data;
2/*
2using TribalMedia.Framework.Data; 3using TribalMedia.Framework.Data;
3 4
4namespace OpenSim.Framework.Data 5namespace OpenSim.Framework.Data
@@ -10,3 +11,4 @@ namespace OpenSim.Framework.Data
10 } 11 }
11 } 12 }
12} 13}
14*/
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 @@
1using System; 1using System;
2using OpenSim.Framework; 2using OpenSim.Framework;
3using TribalMedia.Framework.Data; 3//using TribalMedia.Framework.Data;
4using libsecondlife; 4using libsecondlife;
5 5
6/*
6namespace OpenSim.Framework.Data 7namespace OpenSim.Framework.Data
7{ 8{
8 public class PrimitiveBaseShapeRowMapper : BaseRowMapper<PrimitiveBaseShape> 9 public class PrimitiveBaseShapeRowMapper : BaseRowMapper<PrimitiveBaseShape>
@@ -141,3 +142,4 @@ namespace OpenSim.Framework.Data
141 } 142 }
142 } 143 }
143} 144}
145*/