diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 238fcc2adf..f8e8f572d9 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 float pathShearY = pbs.PathShearY < 128 ? (float)pbs.PathShearY * 0.01f : (float)(pbs.PathShearY - 256) * 0.01f; float pathBegin = (float)pbs.PathBegin * 2.0e-5f; float pathEnd = 1.0f - (float)pbs.PathEnd * 2.0e-5f; - float pathScaleX = (float)(pbs.PathScaleX - 100) * 0.01f; - float pathScaleY = (float)(pbs.PathScaleY - 100) * 0.01f; + float pathScaleX = (float)(200 - pbs.PathScaleX) * 0.01f; + float pathScaleY = (float)(200 - pbs.PathScaleY) * 0.01f; + float pathTaperX = pbs.PathTaperX * 0.01f; + float pathTaperY = pbs.PathTaperY * 0.01f; float profileBegin = (float)pbs.ProfileBegin * 2.0e-5f; 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 4bec062fe7..ed7ff9b13d 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 pbs = PrimitiveBaseShape.CreateSphere(); pbs.ProfileShape = (byte)ProfileShape.Circle; pbs.PathCurve = (byte)Extrusion.Curve1; + pbs.PathScaleX = 100; // default hollow info as set in the viewer + pbs.PathScaleY = 25; pos = new Vector3(120.0f, 120.0f, 0f); pos.Z = PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(pos) + 10f; ObjectInitPosition = pos; diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 343f83df6c..045fa88fa7 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -49,7 +49,7 @@ ;# {PublicPort} {} {PublicPort} {8002} "8002" PublicPort = "8002" - ;# {PrivatePort} {} {PublicPort} {8003} "8003" + ;# {PrivatePort} {} {PrivatePort} {8003} "8003" PrivatePort = "8003" diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 7d6077699d..342ccdf16d 100755 Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so index 5c9255f584..87ecf1d7ef 100755 Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll index fbfd76d896..60b3a2201b 100755 Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so index bd6b9a29f8..5959df0a77 100755 Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ