diff options
author | Mic Bowman | 2011-08-19 14:49:16 -0700 |
---|---|---|
committer | Mic Bowman | 2011-08-19 14:49:16 -0700 |
commit | 384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f (patch) | |
tree | 5e557eac5d4d3d4ad95b9e3e70a2a661e5745ec3 /prebuild.xml | |
parent | BulletSim: add runtime setting of physics parameters. Update default values. (diff) | |
parent | Get rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.... (diff) | |
download | opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.zip opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.gz opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.bz2 opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.xz |
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to '')
-rw-r--r-- | prebuild.xml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index f505731..392fbdc 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1738,6 +1738,7 @@ | |||
1738 | 1738 | ||
1739 | <ReferencePath>../../../bin/</ReferencePath> | 1739 | <ReferencePath>../../../bin/</ReferencePath> |
1740 | <Reference name="System"/> | 1740 | <Reference name="System"/> |
1741 | <Reference name="System.Core"/> | ||
1741 | <Reference name="System.Xml"/> | 1742 | <Reference name="System.Xml"/> |
1742 | <Reference name="System.Drawing"/> | 1743 | <Reference name="System.Drawing"/> |
1743 | <Reference name="System.Web"/> | 1744 | <Reference name="System.Web"/> |
@@ -2121,6 +2122,7 @@ | |||
2121 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | 2122 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> |
2122 | <Reference name="OpenMetaverse" path="../../../../bin/"/> | 2123 | <Reference name="OpenMetaverse" path="../../../../bin/"/> |
2123 | <Reference name="System"/> | 2124 | <Reference name="System"/> |
2125 | <Reference name="System.Core"/> | ||
2124 | <Reference name="OpenSim.Framework"/> | 2126 | <Reference name="OpenSim.Framework"/> |
2125 | <Reference name="OpenSim.Region.Framework"/> | 2127 | <Reference name="OpenSim.Region.Framework"/> |
2126 | <Reference name="Nini" path="../../../../bin/"/> | 2128 | <Reference name="Nini" path="../../../../bin/"/> |
@@ -2366,6 +2368,7 @@ | |||
2366 | <Reference name="System.Xml"/> | 2368 | <Reference name="System.Xml"/> |
2367 | <Reference name="OpenMetaverseTypes" path="../../../../../../bin/"/> | 2369 | <Reference name="OpenMetaverseTypes" path="../../../../../../bin/"/> |
2368 | <Reference name="OpenMetaverse" path="../../../../../../bin/"/> | 2370 | <Reference name="OpenMetaverse" path="../../../../../../bin/"/> |
2371 | <Reference name="OpenMetaverse.StructuredData" path="../../../../../../bin/"/> | ||
2369 | <Reference name="OpenSim"/> | 2372 | <Reference name="OpenSim"/> |
2370 | <Reference name="OpenSim.Framework"/> | 2373 | <Reference name="OpenSim.Framework"/> |
2371 | <Reference name="OpenSim.Framework.Communications"/> | 2374 | <Reference name="OpenSim.Framework.Communications"/> |
@@ -2774,6 +2777,7 @@ | |||
2774 | 2777 | ||
2775 | <ReferencePath>../../../bin/</ReferencePath> | 2778 | <ReferencePath>../../../bin/</ReferencePath> |
2776 | <Reference name="System"/> | 2779 | <Reference name="System"/> |
2780 | <Reference name="System.Core"/> | ||
2777 | <Reference name="System.Drawing"/> | 2781 | <Reference name="System.Drawing"/> |
2778 | <Reference name="System.Xml"/> | 2782 | <Reference name="System.Xml"/> |
2779 | <Reference name="System.Data"/> | 2783 | <Reference name="System.Data"/> |
@@ -3012,6 +3016,7 @@ | |||
3012 | <!-- SADLY the way this works means you need to keep adding these paths --> | 3016 | <!-- SADLY the way this works means you need to keep adding these paths --> |
3013 | <Match path="Agent/TextureSender/Tests" pattern="*.cs" recurse="true"/> | 3017 | <Match path="Agent/TextureSender/Tests" pattern="*.cs" recurse="true"/> |
3014 | <Match path="Asset/Tests" pattern="*.cs" recurse="true"/> | 3018 | <Match path="Asset/Tests" pattern="*.cs" recurse="true"/> |
3019 | <Match path="Avatar/Attachments/Tests" pattern="*.cs" recurse="true"/> | ||
3015 | <Match path="Avatar/AvatarFactory/Tests" pattern="*.cs" recurse="true"/> | 3020 | <Match path="Avatar/AvatarFactory/Tests" pattern="*.cs" recurse="true"/> |
3016 | <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> | 3021 | <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> |
3017 | <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/> | 3022 | <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/> |
@@ -3192,15 +3197,23 @@ | |||
3192 | 3197 | ||
3193 | <ReferencePath>../../../bin/</ReferencePath> | 3198 | <ReferencePath>../../../bin/</ReferencePath> |
3194 | <Reference name="System"/> | 3199 | <Reference name="System"/> |
3200 | <Reference name="System.Xml"/> | ||
3195 | <Reference name="OpenSim.Framework"/> | 3201 | <Reference name="OpenSim.Framework"/> |
3196 | <Reference name="OpenSim.Framework.Communications"/> | 3202 | <Reference name="OpenSim.Framework.Communications"/> |
3203 | <Reference name="OpenSim.Region.CoreModules"/> | ||
3197 | <Reference name="OpenSim.Region.Framework"/> | 3204 | <Reference name="OpenSim.Region.Framework"/> |
3205 | <Reference name="OpenSim.Region.OptionalModules"/> | ||
3198 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> | 3206 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> |
3199 | <Reference name="OpenSim.Region.ScriptEngine.Shared.Api"/> | 3207 | <Reference name="OpenSim.Region.ScriptEngine.Shared.Api"/> |
3208 | <Reference name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime"/> | ||
3200 | <Reference name="OpenSim.Region.ScriptEngine.XEngine"/> | 3209 | <Reference name="OpenSim.Region.ScriptEngine.XEngine"/> |
3210 | <Reference name="OpenSim.Services.Interfaces"/> | ||
3201 | <Reference name="OpenSim.Tests.Common"/> | 3211 | <Reference name="OpenSim.Tests.Common"/> |
3212 | <Reference name="log4net" path="../../../bin/"/> | ||
3202 | <Reference name="nunit.framework" path="../../../bin/"/> | 3213 | <Reference name="nunit.framework" path="../../../bin/"/> |
3203 | <Reference name="Nini" path="../../../bin/"/> | 3214 | <Reference name="Nini" path="../../../bin/"/> |
3215 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
3216 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
3204 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 3217 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
3205 | <Reference name="OpenSim.Region.ScriptEngine.Shared.CodeTools"/> | 3218 | <Reference name="OpenSim.Region.ScriptEngine.Shared.CodeTools"/> |
3206 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> | 3219 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> |