diff options
| author | Robert Adams | 2013-11-04 22:10:54 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-11-04 22:10:54 -0800 |
| commit | f2810bf03a3e254e0ef8d9bdd639c69cc5cf570c (patch) | |
| tree | 15637fe54b419ea5639a08717b1c9978714b49fe /OpenSim/Tests | |
| parent | varregion: remove uses of region size constant. In particular, update scene (diff) | |
| download | opensim-SC-f2810bf03a3e254e0ef8d9bdd639c69cc5cf570c.zip opensim-SC-f2810bf03a3e254e0ef8d9bdd639c69cc5cf570c.tar.gz opensim-SC-f2810bf03a3e254e0ef8d9bdd639c69cc5cf570c.tar.bz2 opensim-SC-f2810bf03a3e254e0ef8d9bdd639c69cc5cf570c.tar.xz | |
varregion: add plumbing to pass region size from Scene down to the
physics engine.
Older physics engines will default to the legacy region size.
Update BulletSim to use the new region size information.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index 4cdfe98..008f2d0 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
| @@ -186,8 +186,9 @@ namespace OpenSim.Tests.Common | |||
| 186 | 186 | ||
| 187 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); | 187 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); |
| 188 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); | 188 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); |
| 189 | Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); | ||
| 189 | testScene.PhysicsScene | 190 | testScene.PhysicsScene |
| 190 | = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", new IniConfigSource(), "test"); | 191 | = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent); |
| 191 | 192 | ||
| 192 | testScene.RegionInfo.EstateSettings = new EstateSettings(); | 193 | testScene.RegionInfo.EstateSettings = new EstateSettings(); |
| 193 | testScene.LoginsEnabled = true; | 194 | testScene.LoginsEnabled = true; |