diff options
author | Diva Canto | 2015-01-04 19:07:40 -0800 |
---|---|---|
committer | Diva Canto | 2015-01-04 19:07:40 -0800 |
commit | 502aa7bb1528f41b5d58219c300c41ba683a81eb (patch) | |
tree | 805cdf5a785c48a8c4880099b4869f8376b0f22a /OpenSim/Region/Physics/BulletSPlugin/Tests | |
parent | Added overloaded LoadArchSpecificWindowsDll, to help addins load native libra... (diff) | |
parent | Fix typo in OpenSim.ini.example (diff) | |
download | opensim-SC-502aa7bb1528f41b5d58219c300c41ba683a81eb.zip opensim-SC-502aa7bb1528f41b5d58219c300c41ba683a81eb.tar.gz opensim-SC-502aa7bb1528f41b5d58219c300c41ba683a81eb.tar.bz2 opensim-SC-502aa7bb1528f41b5d58219c300c41ba683a81eb.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/Tests')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs b/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs index 4bec062..ed7ff9b 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs | |||
@@ -135,6 +135,8 @@ public class HullCreation : OpenSimTestCase | |||
135 | pbs = PrimitiveBaseShape.CreateSphere(); | 135 | pbs = PrimitiveBaseShape.CreateSphere(); |
136 | pbs.ProfileShape = (byte)ProfileShape.Circle; | 136 | pbs.ProfileShape = (byte)ProfileShape.Circle; |
137 | pbs.PathCurve = (byte)Extrusion.Curve1; | 137 | pbs.PathCurve = (byte)Extrusion.Curve1; |
138 | pbs.PathScaleX = 100; // default hollow info as set in the viewer | ||
139 | pbs.PathScaleY = 25; | ||
138 | pos = new Vector3(120.0f, 120.0f, 0f); | 140 | pos = new Vector3(120.0f, 120.0f, 0f); |
139 | pos.Z = PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(pos) + 10f; | 141 | pos.Z = PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(pos) + 10f; |
140 | ObjectInitPosition = pos; | 142 | ObjectInitPosition = pos; |