diff options
author | Justin Clarke Casey | 2008-01-21 18:39:54 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-01-21 18:39:54 +0000 |
commit | c3594ba7d19c268db1275b6cf3491ba50d6c5790 (patch) | |
tree | efecd2fdc4fbf3f209f79320a4de1444fe4e756d /OpenSim/Framework/Data | |
parent | * Fix accidental commenting out of OpenSim.Framework.Data (diff) | |
download | opensim-SC-c3594ba7d19c268db1275b6cf3491ba50d6c5790.zip opensim-SC-c3594ba7d19c268db1275b6cf3491ba50d6c5790.tar.gz opensim-SC-c3594ba7d19c268db1275b6cf3491ba50d6c5790.tar.bz2 opensim-SC-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/Data')
5 files changed, 12 insertions, 1 deletions
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; | |||
3 | using System.Data; | 3 | using System.Data; |
4 | using System.Text; | 4 | using System.Text; |
5 | using libsecondlife; | 5 | using libsecondlife; |
6 | |||
7 | /* | ||
6 | using TribalMedia.Framework.Data; | 8 | using TribalMedia.Framework.Data; |
7 | 9 | ||
8 | namespace OpenSim.Framework.Data | 10 | namespace 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 @@ | |||
1 | using System.Data; | 1 | using System.Data; |
2 | using libsecondlife; | 2 | using libsecondlife; |
3 | /* | ||
3 | using TribalMedia.Framework.Data; | 4 | using TribalMedia.Framework.Data; |
4 | 5 | ||
5 | namespace OpenSim.Framework.Data | 6 | namespace 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; | |||
3 | using System.Data.Common; | 3 | using System.Data.Common; |
4 | using System.Text; | 4 | using System.Text; |
5 | using libsecondlife; | 5 | using libsecondlife; |
6 | /* | ||
6 | using TribalMedia.Framework.Data; | 7 | using TribalMedia.Framework.Data; |
7 | 8 | ||
8 | namespace OpenSim.Framework.Data | 9 | namespace 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 @@ | |||
1 | using System.Data; | 1 | using System.Data; |
2 | /* | ||
2 | using TribalMedia.Framework.Data; | 3 | using TribalMedia.Framework.Data; |
3 | 4 | ||
4 | namespace OpenSim.Framework.Data | 5 | namespace 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 @@ | |||
1 | using System; | 1 | using System; |
2 | using OpenSim.Framework; | 2 | using OpenSim.Framework; |
3 | using TribalMedia.Framework.Data; | 3 | //using TribalMedia.Framework.Data; |
4 | using libsecondlife; | 4 | using libsecondlife; |
5 | 5 | ||
6 | /* | ||
6 | namespace OpenSim.Framework.Data | 7 | namespace 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 | */ | ||