aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-12 03:26:22 +0100
committerJustin Clark-Casey (justincc)2011-07-12 03:26:22 +0100
commitd31e0a67f7d7c2b1882a2030fe01d5d2ee32ad2a (patch)
treefb4943e75cf8862476abd42167200dccb1109244
parentminor: remove whitespace to trigger another build (diff)
downloadopensim-SC_OLD-d31e0a67f7d7c2b1882a2030fe01d5d2ee32ad2a.zip
opensim-SC_OLD-d31e0a67f7d7c2b1882a2030fe01d5d2ee32ad2a.tar.gz
opensim-SC_OLD-d31e0a67f7d7c2b1882a2030fe01d5d2ee32ad2a.tar.bz2
opensim-SC_OLD-d31e0a67f7d7c2b1882a2030fe01d5d2ee32ad2a.tar.xz
temporarily fix the build break with building the OdePlugin tests assembly.
This needs to be fixed properly.
-rw-r--r--OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs5
-rw-r--r--prebuild.xml2
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs b/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs
index a7f8baa..fbd1574 100644
--- a/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs
+++ b/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs
@@ -31,17 +31,18 @@ using NUnit.Framework;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Physics.Manager; 33using OpenSim.Region.Physics.Manager;
34using OpenSim.Region.Physics.OdePlugin;
34using log4net; 35using log4net;
35using System.Reflection; 36using System.Reflection;
36 37
37namespace OpenSim.Region.Physics.OdePlugin 38namespace OpenSim.Region.Physics.OdePlugin.Tests
38{ 39{
39 [TestFixture] 40 [TestFixture]
40 public class ODETestClass 41 public class ODETestClass
41 { 42 {
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 44
44 private OdePlugin cbt; 45 private OpenSim.Region.Physics.OdePlugin.OdePlugin cbt;
45 private PhysicsScene ps; 46 private PhysicsScene ps;
46 private IMeshingPlugin imp; 47 private IMeshingPlugin imp;
47 48
diff --git a/prebuild.xml b/prebuild.xml
index 2ccf614..92368ef 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -3186,7 +3186,7 @@
3186 <Reference name="OpenSim.Framework"/> 3186 <Reference name="OpenSim.Framework"/>
3187 <Reference name="OpenSim.Framework.Console"/> 3187 <Reference name="OpenSim.Framework.Console"/>
3188 <Reference name="OpenSim.Region.Physics.Manager"/> 3188 <Reference name="OpenSim.Region.Physics.Manager"/>
3189 <Reference name="OpenSim.Region.Physics.OdePlugin"/> 3189 <Reference name="OpenSim.Region.Physics.OdePlugin" path="../../../../../bin/Physics/"/>
3190 <Reference name="Ode.NET" path="../../../../../bin/"/> 3190 <Reference name="Ode.NET" path="../../../../../bin/"/>
3191 <Reference name="nunit.framework" path="../../../../../bin/"/> 3191 <Reference name="nunit.framework" path="../../../../../bin/"/>
3192 <Reference name="log4net" path="../../../../../bin/"/> 3192 <Reference name="log4net" path="../../../../../bin/"/>