diff options
author | Justin Clark-Casey (justincc) | 2014-07-29 01:21:15 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-07-29 01:21:15 +0100 |
commit | 3654ae8d8cea0bf0455974efe18ff99e484d2893 (patch) | |
tree | 4daebd94efd967de9d64f69ace7d057f514635e6 /OpenSim/Tests/Common/Mock/TestScene.cs | |
parent | minor: make "debug scene set" usage command accurate again from last commit f... (diff) | |
download | opensim-SC_OLD-3654ae8d8cea0bf0455974efe18ff99e484d2893.zip opensim-SC_OLD-3654ae8d8cea0bf0455974efe18ff99e484d2893.tar.gz opensim-SC_OLD-3654ae8d8cea0bf0455974efe18ff99e484d2893.tar.bz2 opensim-SC_OLD-3654ae8d8cea0bf0455974efe18ff99e484d2893.tar.xz |
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.
Diffstat (limited to 'OpenSim/Tests/Common/Mock/TestScene.cs')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestScene.cs | 5 |
1 files changed, 3 insertions, 2 deletions
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; | |||
33 | using OpenSim.Region.Framework; | 33 | using OpenSim.Region.Framework; |
34 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using OpenSim.Region.Physics.Manager; | ||
36 | using OpenSim.Services.Interfaces; | 37 | using OpenSim.Services.Interfaces; |
37 | 38 | ||
38 | namespace OpenSim.Tests.Common.Mock | 39 | namespace OpenSim.Tests.Common.Mock |
@@ -40,10 +41,10 @@ namespace OpenSim.Tests.Common.Mock | |||
40 | public class TestScene : Scene | 41 | public class TestScene : Scene |
41 | { | 42 | { |
42 | public TestScene( | 43 | public TestScene( |
43 | RegionInfo regInfo, AgentCircuitManager authen, | 44 | RegionInfo regInfo, AgentCircuitManager authen, PhysicsScene physicsScene, |
44 | SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService, | 45 | SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService, |
45 | IConfigSource config, string simulatorVersion) | 46 | IConfigSource config, string simulatorVersion) |
46 | : base(regInfo, authen, sceneGridService, simDataService, estateDataService, | 47 | : base(regInfo, authen, physicsScene, sceneGridService, simDataService, estateDataService, |
47 | config, simulatorVersion) | 48 | config, simulatorVersion) |
48 | { | 49 | { |
49 | } | 50 | } |