aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2015-01-04 19:07:40 -0800
committerDiva Canto2015-01-04 19:07:40 -0800
commit502aa7bb1528f41b5d58219c300c41ba683a81eb (patch)
tree805cdf5a785c48a8c4880099b4869f8376b0f22a /OpenSim
parentAdded overloaded LoadArchSpecificWindowsDll, to help addins load native libra... (diff)
parentFix typo in OpenSim.ini.example (diff)
downloadopensim-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')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs6
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs2
2 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 238fcc2..f8e8f57 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -953,8 +953,10 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
953 float pathShearY = pbs.PathShearY < 128 ? (float)pbs.PathShearY * 0.01f : (float)(pbs.PathShearY - 256) * 0.01f; 953 float pathShearY = pbs.PathShearY < 128 ? (float)pbs.PathShearY * 0.01f : (float)(pbs.PathShearY - 256) * 0.01f;
954 float pathBegin = (float)pbs.PathBegin * 2.0e-5f; 954 float pathBegin = (float)pbs.PathBegin * 2.0e-5f;
955 float pathEnd = 1.0f - (float)pbs.PathEnd * 2.0e-5f; 955 float pathEnd = 1.0f - (float)pbs.PathEnd * 2.0e-5f;
956 float pathScaleX = (float)(pbs.PathScaleX - 100) * 0.01f; 956 float pathScaleX = (float)(200 - pbs.PathScaleX) * 0.01f;
957 float pathScaleY = (float)(pbs.PathScaleY - 100) * 0.01f; 957 float pathScaleY = (float)(200 - pbs.PathScaleY) * 0.01f;
958 float pathTaperX = pbs.PathTaperX * 0.01f;
959 float pathTaperY = pbs.PathTaperY * 0.01f;
958 960
959 float profileBegin = (float)pbs.ProfileBegin * 2.0e-5f; 961 float profileBegin = (float)pbs.ProfileBegin * 2.0e-5f;
960 float profileEnd = 1.0f - (float)pbs.ProfileEnd * 2.0e-5f; 962 float profileEnd = 1.0f - (float)pbs.ProfileEnd * 2.0e-5f;
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;