aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Data.Base/BaseDataReader.cs (renamed from ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseDataReader.cs)0
-rw-r--r--OpenSim/Framework/Data.Base/BaseDatabaseConnector.cs (renamed from ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseDatabaseConnector.cs)0
-rw-r--r--OpenSim/Framework/Data.Base/BaseFieldMapper.cs (renamed from ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseFieldMapper.cs)0
-rw-r--r--OpenSim/Framework/Data.Base/BaseRowMapper.cs (renamed from ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseRowMapper.cs)0
-rw-r--r--OpenSim/Framework/Data.Base/BaseSchema.cs (renamed from ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseSchema.cs)0
-rw-r--r--OpenSim/Framework/Data.Base/BaseTableMapper.cs (renamed from ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseTableMapper.cs)0
-rw-r--r--OpenSim/Framework/Data.Base/Properties/AssemblyInfo.cs (renamed from ThirdParty/TribalMedia/TribalMedia.Framework.Data/Properties/AssemblyInfo.cs)0
-rw-r--r--OpenSim/Framework/Data.Base/TribalMedia.Framework.Data.snk (renamed from ThirdParty/TribalMedia/TribalMedia.Framework.Data/TribalMedia.Framework.Data.snk)bin596 -> 596 bytes
-rw-r--r--prebuild.xml7
9 files changed, 3 insertions, 4 deletions
diff --git a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseDataReader.cs b/OpenSim/Framework/Data.Base/BaseDataReader.cs
index 67fb7c1..67fb7c1 100644
--- a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseDataReader.cs
+++ b/OpenSim/Framework/Data.Base/BaseDataReader.cs
diff --git a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseDatabaseConnector.cs b/OpenSim/Framework/Data.Base/BaseDatabaseConnector.cs
index 45ca650..45ca650 100644
--- a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseDatabaseConnector.cs
+++ b/OpenSim/Framework/Data.Base/BaseDatabaseConnector.cs
diff --git a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseFieldMapper.cs b/OpenSim/Framework/Data.Base/BaseFieldMapper.cs
index 20f919a..20f919a 100644
--- a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseFieldMapper.cs
+++ b/OpenSim/Framework/Data.Base/BaseFieldMapper.cs
diff --git a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseRowMapper.cs b/OpenSim/Framework/Data.Base/BaseRowMapper.cs
index e8292fd..e8292fd 100644
--- a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseRowMapper.cs
+++ b/OpenSim/Framework/Data.Base/BaseRowMapper.cs
diff --git a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseSchema.cs b/OpenSim/Framework/Data.Base/BaseSchema.cs
index a6740c2..a6740c2 100644
--- a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseSchema.cs
+++ b/OpenSim/Framework/Data.Base/BaseSchema.cs
diff --git a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseTableMapper.cs b/OpenSim/Framework/Data.Base/BaseTableMapper.cs
index d69fcbb..d69fcbb 100644
--- a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/BaseTableMapper.cs
+++ b/OpenSim/Framework/Data.Base/BaseTableMapper.cs
diff --git a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.Base/Properties/AssemblyInfo.cs
index 457624e..457624e 100644
--- a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.Base/Properties/AssemblyInfo.cs
diff --git a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/TribalMedia.Framework.Data.snk b/OpenSim/Framework/Data.Base/TribalMedia.Framework.Data.snk
index fc71027..fc71027 100644
--- a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/TribalMedia.Framework.Data.snk
+++ b/OpenSim/Framework/Data.Base/TribalMedia.Framework.Data.snk
Binary files differ
diff --git a/prebuild.xml b/prebuild.xml
index 1af4e04..17ae6aa 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -155,7 +155,7 @@
155 </Files> 155 </Files>
156 </Project> 156 </Project>
157 157
158 <Project name="TribalMedia.Framework.Data" path="ThirdParty/TribalMedia/TribalMedia.Framework.Data" type="Library"> 158 <Project name="OpenSim.Framework.Data.Base" path="OpenSim/Framework/Data.Base" type="Library">
159 <Configuration name="Debug"> 159 <Configuration name="Debug">
160 <Options> 160 <Options>
161 <OutputPath>../../../bin/</OutputPath> 161 <OutputPath>../../../bin/</OutputPath>
@@ -197,7 +197,7 @@
197 <Reference name="libsecondlife.dll"/> 197 <Reference name="libsecondlife.dll"/>
198 <Reference name="OpenSim.Framework"/> 198 <Reference name="OpenSim.Framework"/>
199 <Reference name="MySql.Data.dll"/> 199 <Reference name="MySql.Data.dll"/>
200 <Reference name="TribalMedia.Framework.Data"/> 200 <Reference name="OpenSim.Framework.Data.Base"/>
201 <Reference name="log4net"/> 201 <Reference name="log4net"/>
202 <Files> 202 <Files>
203 <Match pattern="*.cs" recurse="true"/> 203 <Match pattern="*.cs" recurse="true"/>
@@ -722,7 +722,7 @@
722 <Reference name="Microsoft.JScript"/> 722 <Reference name="Microsoft.JScript"/>
723 <Reference name="XMLRPC.dll"/> 723 <Reference name="XMLRPC.dll"/>
724 <Reference name="OpenSim.Framework.Communications"/> 724 <Reference name="OpenSim.Framework.Communications"/>
725 <Reference name="TribalMedia.Framework.Data"/> 725 <Reference name="OpenSim.Framework.Data.Base"/>
726 <Reference name="Nini.dll" /> 726 <Reference name="Nini.dll" />
727 <Reference name="log4net"/> 727 <Reference name="log4net"/>
728 <Files> 728 <Files>
@@ -1018,7 +1018,6 @@
1018 <Reference name="System.Data"/> 1018 <Reference name="System.Data"/>
1019 <Reference name="OpenSim.Framework"/> 1019 <Reference name="OpenSim.Framework"/>
1020 <Reference name="OpenSim.Framework.Data"/> 1020 <Reference name="OpenSim.Framework.Data"/>
1021 <!-- <Reference name="TribalMedia.Framework.Data"/> -->
1022 <Reference name="libsecondlife.dll"/> 1021 <Reference name="libsecondlife.dll"/>
1023 <Reference name="MySql.Data.dll"/> 1022 <Reference name="MySql.Data.dll"/>
1024 <Reference name="OpenSim.Framework.Console"/> 1023 <Reference name="OpenSim.Framework.Console"/>