aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs2
-rw-r--r--prebuild.xml5
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 @@
1using System.Data.Common; 1using System.Data.Common;
2using MySql.Data.MySqlClient; 2using MySql.Data.MySqlClient;
3using TribalMedia.Framework.Data; 3// using TribalMedia.Framework.Data;
4 4
5namespace OpenSim.Framework.Data.MySQL 5namespace 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"/>