diff options
author | Melanie | 2012-01-31 20:53:49 +0000 |
---|---|---|
committer | Melanie | 2012-01-31 20:53:49 +0000 |
commit | 1b63b21a4db192cdfb24748be523dd53bbba47a9 (patch) | |
tree | a9c45afd55fb652e35c9a703560c7e35af2cdfa6 /prebuild.xml | |
parent | Make parcel sale overlays work. No auction support. (diff) | |
parent | Remove scene object null check on SceneGraph.AddSceneObject(). Complain expl... (diff) | |
download | opensim-SC_OLD-1b63b21a4db192cdfb24748be523dd53bbba47a9.zip opensim-SC_OLD-1b63b21a4db192cdfb24748be523dd53bbba47a9.tar.gz opensim-SC_OLD-1b63b21a4db192cdfb24748be523dd53bbba47a9.tar.bz2 opensim-SC_OLD-1b63b21a4db192cdfb24748be523dd53bbba47a9.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml index 7b3181b..aab61ad 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -2854,7 +2854,6 @@ | |||
2854 | </Files> | 2854 | </Files> |
2855 | </Project> | 2855 | </Project> |
2856 | 2856 | ||
2857 | |||
2858 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Tests" path="OpenSim/Framework/Tests" type="Library"> | 2857 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Tests" path="OpenSim/Framework/Tests" type="Library"> |
2859 | <Configuration name="Debug"> | 2858 | <Configuration name="Debug"> |
2860 | <Options> | 2859 | <Options> |
@@ -3291,6 +3290,39 @@ | |||
3291 | </Files> | 3290 | </Files> |
3292 | </Project> | 3291 | </Project> |
3293 | 3292 | ||
3293 | <Project frameworkVersion="v3_5" name="OpenSim.Tests.Torture" path="OpenSim/Tests/Torture" type="Library"> | ||
3294 | <Configuration name="Debug"> | ||
3295 | <Options> | ||
3296 | <OutputPath>../../../bin/</OutputPath> | ||
3297 | </Options> | ||
3298 | </Configuration> | ||
3299 | <Configuration name="Release"> | ||
3300 | <Options> | ||
3301 | <OutputPath>../../../bin/</OutputPath> | ||
3302 | </Options> | ||
3303 | </Configuration> | ||
3304 | |||
3305 | <ReferencePath>../../../bin/</ReferencePath> | ||
3306 | <Reference name="System"/> | ||
3307 | <Reference name="System.Xml"/> | ||
3308 | <Reference name="System.Data"/> | ||
3309 | <Reference name="log4net" path="../../../bin/"/> | ||
3310 | <Reference name="Nini" path="../../../bin/"/> | ||
3311 | <Reference name="nunit.framework" path="../../../bin/"/> | ||
3312 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
3313 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
3314 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
3315 | <Reference name="XMLRPC" path="../../../bin/"/> | ||
3316 | <Reference name="OpenSim.Framework"/> | ||
3317 | <Reference name="OpenSim.Framework.Console"/> | ||
3318 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
3319 | <Reference name="OpenSim.Region.Framework"/> | ||
3320 | <Reference name="OpenSim.Tests.Common"/> | ||
3321 | <Files> | ||
3322 | <Match pattern="*.cs" recurse="false"/> | ||
3323 | </Files> | ||
3324 | </Project> | ||
3325 | |||
3294 | <?include file="addon-modules/*/prebuild*.xml" ?> | 3326 | <?include file="addon-modules/*/prebuild*.xml" ?> |
3295 | 3327 | ||
3296 | </Solution> | 3328 | </Solution> |