Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

7 files changed, 7 insertions, 3 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
         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 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
         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 343f83d..045fa88 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 7d60776..342ccdf 100755
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 5c9255f..87ecf1d 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index fbfd76d..60b3a22 100755
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index bd6b9a2..5959df0 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so