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 | |
parent | Added overloaded LoadArchSpecificWindowsDll, to help addins load native libra... (diff) | |
parent | Fix typo in OpenSim.ini.example (diff) | |
download | opensim-SC_OLD-502aa7bb1528f41b5d58219c300c41ba683a81eb.zip opensim-SC_OLD-502aa7bb1528f41b5d58219c300c41ba683a81eb.tar.gz opensim-SC_OLD-502aa7bb1528f41b5d58219c300c41ba683a81eb.tar.bz2 opensim-SC_OLD-502aa7bb1528f41b5d58219c300c41ba683a81eb.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs | 2 | ||||
-rw-r--r-- | bin/OpenSim.ini.example | 2 | ||||
-rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 1337856 -> 1337344 bytes | |||
-rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2310508 -> 2310500 bytes | |||
-rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 1546752 -> 1546240 bytes | |||
-rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 2473989 -> 2473981 bytes |
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 | |||
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; |
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 @@ | |||
49 | ;# {PublicPort} {} {PublicPort} {8002} "8002" | 49 | ;# {PublicPort} {} {PublicPort} {8002} "8002" |
50 | PublicPort = "8002" | 50 | PublicPort = "8002" |
51 | 51 | ||
52 | ;# {PrivatePort} {} {PublicPort} {8003} "8003" | 52 | ;# {PrivatePort} {} {PrivatePort} {8003} "8003" |
53 | PrivatePort = "8003" | 53 | PrivatePort = "8003" |
54 | 54 | ||
55 | 55 | ||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||