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/Region/CoreModules/Framework/Library | |
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/Region/CoreModules/Framework/Library')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs index 69d7e16..d10c9b4 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | |||
@@ -159,7 +159,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
159 | } | 159 | } |
160 | 160 | ||
161 | RegionInfo regInfo = new RegionInfo(); | 161 | RegionInfo regInfo = new RegionInfo(); |
162 | Scene m_MockScene = new Scene(regInfo); | 162 | Scene m_MockScene = new Scene(regInfo, null); |
163 | LocalInventoryService invService = new LocalInventoryService(lib); | 163 | LocalInventoryService invService = new LocalInventoryService(lib); |
164 | m_MockScene.RegisterModuleInterface<IInventoryService>(invService); | 164 | m_MockScene.RegisterModuleInterface<IInventoryService>(invService); |
165 | m_MockScene.RegisterModuleInterface<IAssetService>(m_Scene.AssetService); | 165 | m_MockScene.RegisterModuleInterface<IAssetService>(m_Scene.AssetService); |