diff options
| author | Mic Bowman | 2012-04-25 09:52:44 -0700 |
|---|---|---|
| committer | Mic Bowman | 2012-04-25 09:52:44 -0700 |
| commit | 1afae013111b7c817037371fca805a78c3ab67cc (patch) | |
| tree | dc4f08217c64fd92f4fac250344f009f583fca4e /OpenSim/Tests/Common | |
| parent | Add try/catch around Json script method registration to avoild some issues (diff) | |
| parent | Slight rewording of output messages. (diff) | |
| download | opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.zip opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.tar.gz opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.tar.bz2 opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Tests/Common')
| -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; |