aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-06-08 15:50:21 +0100
committerJustin Clark-Casey (justincc)2010-06-08 15:50:21 +0100
commita160b44e0766329a6c336adcb804cede39e00fc7 (patch)
treeedf6d5070a0bb9dcba424cf883fe20a7c96af751 /prebuild.xml
parentIf a transfer request is received for a task inventory item asset, then route... (diff)
parentminor: remove some commented out code and return ScenePresence.UpdatePriority... (diff)
downloadopensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.zip
opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.tar.gz
opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.tar.bz2
opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.tar.xz
Merge branch '0.6.9-post-fixes' into share-with-group
Diffstat (limited to '')
-rw-r--r--prebuild.xml45
1 files changed, 37 insertions, 8 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 6b25792..d2456b2 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -765,7 +765,6 @@
765 <Reference name="OpenSim.Region.Physics.Manager"/> 765 <Reference name="OpenSim.Region.Physics.Manager"/>
766 766
767 <!-- For scripting in funny languages by default --> 767 <!-- For scripting in funny languages by default -->
768 <Reference name="Microsoft.JScript"/>
769 <Reference name="XMLRPC.dll"/> 768 <Reference name="XMLRPC.dll"/>
770 <Reference name="OpenSim.Framework.Communications"/> 769 <Reference name="OpenSim.Framework.Communications"/>
771 <Reference name="Nini.dll" /> 770 <Reference name="Nini.dll" />
@@ -1619,7 +1618,6 @@
1619 <Reference name="GlynnTucker.Cache.dll"/> 1618 <Reference name="GlynnTucker.Cache.dll"/>
1620 1619
1621 <!-- For scripting in funny languages by default --> 1620 <!-- For scripting in funny languages by default -->
1622 <Reference name="Microsoft.JScript"/>
1623 <Reference name="XMLRPC.dll"/> 1621 <Reference name="XMLRPC.dll"/>
1624 <Reference name="OpenSim.Framework.Communications"/> 1622 <Reference name="OpenSim.Framework.Communications"/>
1625 <Reference name="Nini.dll" /> 1623 <Reference name="Nini.dll" />
@@ -1702,7 +1700,6 @@
1702 <Reference name="Mono.Addins.dll" /> 1700 <Reference name="Mono.Addins.dll" />
1703 1701
1704 <!-- For scripting in funny languages by default --> 1702 <!-- For scripting in funny languages by default -->
1705 <Reference name="Microsoft.JScript"/>
1706 <Reference name="XMLRPC.dll"/> 1703 <Reference name="XMLRPC.dll"/>
1707 <Reference name="OpenSim.Framework.Communications"/> 1704 <Reference name="OpenSim.Framework.Communications"/>
1708 <Reference name="Nini.dll" /> 1705 <Reference name="Nini.dll" />
@@ -2473,7 +2470,7 @@
2473 </Files> 2470 </Files>
2474 </Project> 2471 </Project>
2475 2472
2476 <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library"> 2473 <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLiteLegacy" path="OpenSim/Data/SQLiteLegacy" type="Library">
2477 <Configuration name="Debug"> 2474 <Configuration name="Debug">
2478 <Options> 2475 <Options>
2479 <OutputPath>../../../bin/</OutputPath> 2476 <OutputPath>../../../bin/</OutputPath>
@@ -2510,6 +2507,42 @@
2510 </Files> 2507 </Files>
2511 </Project> 2508 </Project>
2512 2509
2510 <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library">
2511 <Configuration name="Debug">
2512 <Options>
2513 <OutputPath>../../../bin/</OutputPath>
2514 </Options>
2515 </Configuration>
2516 <Configuration name="Release">
2517 <Options>
2518 <OutputPath>../../../bin/</OutputPath>
2519 </Options>
2520 </Configuration>
2521
2522 <ReferencePath>../../../bin/</ReferencePath>
2523 <Reference name="System"/>
2524 <Reference name="System.Xml"/>
2525 <Reference name="System.Data"/>
2526 <Reference name="OpenSim.Data"/>
2527 <Reference name="System.Drawing"/>
2528 <Reference name="OpenSim.Framework"/>
2529 <Reference name="OpenSim.Framework.Console"/>
2530 <Reference name="OpenSim.Region.Framework"/>
2531 <Reference name="OpenMetaverseTypes.dll"/>
2532 <Reference name="OpenMetaverse.dll"/>
2533 <Reference name="Mono.Data.Sqlite"/>
2534 <Reference name="Mono.Addins.dll" />
2535 <Reference name="log4net.dll"/>
2536
2537 <Files>
2538 <Match pattern="*.cs" recurse="true" >
2539 <Exclude name="Tests" pattern="Tests" />
2540 </Match>
2541 <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/>
2542 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
2543 </Files>
2544 </Project>
2545
2513 <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library"> 2546 <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library">
2514 <Configuration name="Debug"> 2547 <Configuration name="Debug">
2515 <Options> 2548 <Options>
@@ -2671,7 +2704,6 @@
2671 2704
2672 <ReferencePath>../../../../../bin/</ReferencePath> 2705 <ReferencePath>../../../../../bin/</ReferencePath>
2673 <Reference name="System"/> 2706 <Reference name="System"/>
2674 <Reference name="Microsoft.JScript"/>
2675 <Reference name="OpenSim.Framework" /> 2707 <Reference name="OpenSim.Framework" />
2676 <Reference name="OpenSim.Region.Framework" /> 2708 <Reference name="OpenSim.Region.Framework" />
2677 <Reference name="OpenSim.Region.ScriptEngine.Shared"/> 2709 <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
@@ -2808,7 +2840,6 @@
2808 <Reference name="Mono.Addins"/> 2840 <Reference name="Mono.Addins"/>
2809 2841
2810 <!-- For scripting in funny languages by default --> 2842 <!-- For scripting in funny languages by default -->
2811 <Reference name="Microsoft.JScript"/>
2812 <Reference name="XMLRPC.dll"/> 2843 <Reference name="XMLRPC.dll"/>
2813 <Reference name="OpenSim.Framework.Communications"/> 2844 <Reference name="OpenSim.Framework.Communications"/>
2814 <Reference name="Nini.dll" /> 2845 <Reference name="Nini.dll" />
@@ -3270,7 +3301,6 @@
3270 <Reference name="nunit.framework.dll"/> 3301 <Reference name="nunit.framework.dll"/>
3271 3302
3272 <!-- For scripting in funny languages by default --> 3303 <!-- For scripting in funny languages by default -->
3273 <Reference name="Microsoft.JScript"/>
3274 <Reference name="XMLRPC.dll"/> 3304 <Reference name="XMLRPC.dll"/>
3275 <Reference name="OpenSim.Framework.Communications"/> 3305 <Reference name="OpenSim.Framework.Communications"/>
3276 <Reference name="Nini.dll" /> 3306 <Reference name="Nini.dll" />
@@ -3334,7 +3364,6 @@
3334 <Reference name="nunit.framework.dll"/> 3364 <Reference name="nunit.framework.dll"/>
3335 3365
3336 <!-- For scripting in funny languages by default --> 3366 <!-- For scripting in funny languages by default -->
3337 <Reference name="Microsoft.JScript"/>
3338 <Reference name="XMLRPC.dll"/> 3367 <Reference name="XMLRPC.dll"/>
3339 <Reference name="OpenSim.Framework.Communications"/> 3368 <Reference name="OpenSim.Framework.Communications"/>
3340 <Reference name="Nini.dll" /> 3369 <Reference name="Nini.dll" />