diff options
author | Sean Dague | 2008-01-21 16:40:23 +0000 |
---|---|---|
committer | Sean Dague | 2008-01-21 16:40:23 +0000 |
commit | 38991ba0e6861fef997f8dba077dd7e8304c26d9 (patch) | |
tree | f1f4e67c23bbd283b3e1da9d9a18be57fd29a571 | |
parent | Method rename (diff) | |
download | opensim-SC_OLD-38991ba0e6861fef997f8dba077dd7e8304c26d9.zip opensim-SC_OLD-38991ba0e6861fef997f8dba077dd7e8304c26d9.tar.gz opensim-SC_OLD-38991ba0e6861fef997f8dba077dd7e8304c26d9.tar.bz2 opensim-SC_OLD-38991ba0e6861fef997f8dba077dd7e8304c26d9.tar.xz |
comment out use of the TribalMedia data mapper layer
for now. It doesn't build on new mono at the moment, and
isn't currently used. Please make sure this functions on
mono 1.2.6 prior to adding it back in for the main tree.
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs | 2 | ||||
-rw-r--r-- | prebuild.xml | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs b/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs index 40d6245..ffaaecb 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs | |||
@@ -1,6 +1,6 @@ | |||
1 | using System.Data.Common; | 1 | using System.Data.Common; |
2 | using MySql.Data.MySqlClient; | 2 | using MySql.Data.MySqlClient; |
3 | using TribalMedia.Framework.Data; | 3 | // using TribalMedia.Framework.Data; |
4 | 4 | ||
5 | namespace OpenSim.Framework.Data.MySQL | 5 | namespace OpenSim.Framework.Data.MySQL |
6 | { | 6 | { |
diff --git a/prebuild.xml b/prebuild.xml index 11c3169..0364198 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -79,6 +79,7 @@ | |||
79 | </Files> | 79 | </Files> |
80 | </Project> | 80 | </Project> |
81 | 81 | ||
82 | <!-- | ||
82 | <Project name="TribalMedia.Framework.Data" path="ThirdParty/TribalMedia/TribalMedia.Framework.Data" type="Library"> | 83 | <Project name="TribalMedia.Framework.Data" path="ThirdParty/TribalMedia/TribalMedia.Framework.Data" type="Library"> |
83 | <Configuration name="Debug"> | 84 | <Configuration name="Debug"> |
84 | <Options> | 85 | <Options> |
@@ -125,7 +126,7 @@ | |||
125 | <Match pattern="*.cs" recurse="true"/> | 126 | <Match pattern="*.cs" recurse="true"/> |
126 | </Files> | 127 | </Files> |
127 | </Project> | 128 | </Project> |
128 | 129 | --> | |
129 | <Project name="OpenSim.Framework.Configuration.XML" path="OpenSim/Framework/Configuration/XML" type="Library"> | 130 | <Project name="OpenSim.Framework.Configuration.XML" path="OpenSim/Framework/Configuration/XML" type="Library"> |
130 | <Configuration name="Debug"> | 131 | <Configuration name="Debug"> |
131 | <Options> | 132 | <Options> |
@@ -906,7 +907,7 @@ | |||
906 | <Reference name="System.Data"/> | 907 | <Reference name="System.Data"/> |
907 | <Reference name="OpenSim.Framework"/> | 908 | <Reference name="OpenSim.Framework"/> |
908 | <Reference name="OpenSim.Framework.Data"/> | 909 | <Reference name="OpenSim.Framework.Data"/> |
909 | <Reference name="TribalMedia.Framework.Data"/> | 910 | <!-- <Reference name="TribalMedia.Framework.Data"/> --> |
910 | <Reference name="libsecondlife.dll"/> | 911 | <Reference name="libsecondlife.dll"/> |
911 | <Reference name="MySql.Data.dll"/> | 912 | <Reference name="MySql.Data.dll"/> |
912 | <Reference name="OpenSim.Framework.Console"/> | 913 | <Reference name="OpenSim.Framework.Console"/> |