aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2007-05-05 23:44:05 +0000
committerAdam Frisby2007-05-05 23:44:05 +0000
commitfe87117e5e7d391a7e29ec0cc6457c07400cd753 (patch)
tree253adc942a35e1619c10e3a6f7a2e0b98e7be87d
parent* Added Microsoft SQL Support (diff)
downloadopensim-SC-fe87117e5e7d391a7e29ec0cc6457c07400cd753.zip
opensim-SC-fe87117e5e7d391a7e29ec0cc6457c07400cd753.tar.gz
opensim-SC-fe87117e5e7d391a7e29ec0cc6457c07400cd753.tar.bz2
opensim-SC-fe87117e5e7d391a7e29ec0cc6457c07400cd753.tar.xz
Fixed issue with prebuild causing duplicate reference with standard libraries.
-rw-r--r--OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj4
-rw-r--r--OpenSim.sln2
-rw-r--r--prebuild.xml1
3 files changed, 1 insertions, 6 deletions
diff --git a/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj b/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
index 3f6fec7..efb6a32 100644
--- a/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
+++ b/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
@@ -70,10 +70,6 @@
70 <HintPath>System.Data.dll</HintPath> 70 <HintPath>System.Data.dll</HintPath>
71 <Private>False</Private> 71 <Private>False</Private>
72 </Reference> 72 </Reference>
73 <Reference Include="System.Data.SqlClient" >
74 <HintPath>System.Data.SqlClient.dll</HintPath>
75 <Private>False</Private>
76 </Reference>
77 <Reference Include="libsecondlife.dll" > 73 <Reference Include="libsecondlife.dll" >
78 <HintPath>..\bin\libsecondlife.dll</HintPath> 74 <HintPath>..\bin\libsecondlife.dll</HintPath>
79 <Private>False</Private> 75 <Private>False</Private>
diff --git a/OpenSim.sln b/OpenSim.sln
index 3f27b40..effb6b65 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -88,7 +88,7 @@ Global
88 ({B0027747-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) 88 ({B0027747-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
89 ({B0027747-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) 89 ({B0027747-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
90 ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000}) 90 ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000})
91 ({0A563AC1-0000-0000-0000-000000000000}).4 = ({62CDF671-0000-0000-0000-000000000000}) 91 ({0A563AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000})
92 ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000}) 92 ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000})
93 ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) 93 ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
94 ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) 94 ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
diff --git a/prebuild.xml b/prebuild.xml
index 602715e..3bfcb62 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -336,7 +336,6 @@
336 <Reference name="System" localCopy="false"/> 336 <Reference name="System" localCopy="false"/>
337 <Reference name="System.Xml"/> 337 <Reference name="System.Xml"/>
338 <Reference name="System.Data"/> 338 <Reference name="System.Data"/>
339 <Reference name="System.Data.SqlClient"/>
340 <Reference name="OpenGrid.Framework.Data"/> 339 <Reference name="OpenGrid.Framework.Data"/>
341 <Reference name="libsecondlife.dll"/> 340 <Reference name="libsecondlife.dll"/>
342 <Files> 341 <Files>