From 3654ae8d8cea0bf0455974efe18ff99e484d2893 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 29 Jul 2014 01:21:15 +0100
Subject: Allow the "debug scene set physics false|true" command to work when
 bulletsim physics is running in a separate thread.

This will also allow the "disable physics" setting in the region debug viewer dialog to work in this circumstance.
---
 OpenSim/Tests/Common/Mock/TestScene.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Tests/Common/Mock')

diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 2773624..40e2adc 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -33,6 +33,7 @@ using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Physics.Manager;
 using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Tests.Common.Mock
@@ -40,10 +41,10 @@ namespace OpenSim.Tests.Common.Mock
     public class TestScene : Scene
     {
         public TestScene(
-            RegionInfo regInfo, AgentCircuitManager authen,
+            RegionInfo regInfo, AgentCircuitManager authen, PhysicsScene physicsScene,
             SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService,
             IConfigSource config, string simulatorVersion)
-            : base(regInfo, authen, sceneGridService, simDataService, estateDataService,
+            : base(regInfo, authen, physicsScene, sceneGridService, simDataService, estateDataService,
                    config, simulatorVersion)
         {
         }
-- 
cgit v1.1