diff options
| author | Melanie | 2012-04-22 15:06:06 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-22 15:06:06 +0100 |
| commit | 8df4bd14f59ec6235cd7a02d74e69e530256b610 (patch) | |
| tree | ee80b18ea802be18aaf24a7045afdd2e444b107a /OpenSim/Tests/Common/Helpers | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Comment out spurious Body != IntPtr.Zero code after disableBody(), since disa... (diff) | |
| download | opensim-SC-8df4bd14f59ec6235cd7a02d74e69e530256b610.zip opensim-SC-8df4bd14f59ec6235cd7a02d74e69e530256b610.tar.gz opensim-SC-8df4bd14f59ec6235cd7a02d74e69e530256b610.tar.bz2 opensim-SC-8df4bd14f59ec6235cd7a02d74e69e530256b610.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Tests/Common/Helpers')
| -rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index 318758d..7a6b1cf 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
| @@ -153,7 +153,7 @@ namespace OpenSim.Tests.Common | |||
| 153 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); | 153 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); |
| 154 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); | 154 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); |
| 155 | testScene.PhysicsScene | 155 | testScene.PhysicsScene |
| 156 | = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", new IniConfigSource(), "test"); | 156 | = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", new IniConfigSource(), "test"); |
| 157 | 157 | ||
| 158 | testScene.RegionInfo.EstateSettings = new EstateSettings(); | 158 | testScene.RegionInfo.EstateSettings = new EstateSettings(); |
| 159 | testScene.LoginsDisabled = false; | 159 | testScene.LoginsDisabled = false; |