diff options
author | Robert Adams | 2015-06-25 22:02:12 -0700 |
---|---|---|
committer | Robert Adams | 2015-06-25 22:02:12 -0700 |
commit | d750647fb1395d8e9cbaf59ec65a6366070ed9d2 (patch) | |
tree | 6c7cadfda69e0bd0eecb85e42cd23de95a487165 | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-d750647fb1395d8e9cbaf59ec65a6366070ed9d2.zip opensim-SC-d750647fb1395d8e9cbaf59ec65a6366070ed9d2.tar.gz opensim-SC-d750647fb1395d8e9cbaf59ec65a6366070ed9d2.tar.bz2 opensim-SC-d750647fb1395d8e9cbaf59ec65a6366070ed9d2.tar.xz |
BulletSim: fix two compiler warnings.
Mostly code left over from things that are not done that way anymore.
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 1 | ||||
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index c670cca..d0cc1eb 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
@@ -61,7 +61,6 @@ public sealed class BSCharacter : BSPhysObject | |||
61 | private const string AvatarMoveActorName = "BSCharacter.AvatarMove"; | 61 | private const string AvatarMoveActorName = "BSCharacter.AvatarMove"; |
62 | 62 | ||
63 | private OMV.Vector3 _PIDTarget; | 63 | private OMV.Vector3 _PIDTarget; |
64 | private bool _usePID; | ||
65 | private float _PIDTau; | 64 | private float _PIDTau; |
66 | 65 | ||
67 | // public override OMV.Vector3 RawVelocity | 66 | // public override OMV.Vector3 RawVelocity |
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs index 22b3f3f..cae9efa 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs | |||
@@ -329,10 +329,6 @@ public sealed class BSLinksetCompound : BSLinkset | |||
329 | // Note that this works for rebuilding just the root after a linkset is taken apart. | 329 | // Note that this works for rebuilding just the root after a linkset is taken apart. |
330 | // Called at taint time!! | 330 | // Called at taint time!! |
331 | private bool UseBulletSimRootOffsetHack = false; // Attempt to have Bullet track the coords of root compound shape | 331 | private bool UseBulletSimRootOffsetHack = false; // Attempt to have Bullet track the coords of root compound shape |
332 | // Number of times to perform rebuilds on broken linkset children. This should only happen when | ||
333 | // a linkset is initially being created and should happen only one or two times at the most. | ||
334 | // This exists to cause a looping problem to be reported while not rebuilding a linkset forever. | ||
335 | private static int LinksetRebuildFailureLoopPrevention = 10; | ||
336 | private void RecomputeLinksetCompound() | 332 | private void RecomputeLinksetCompound() |
337 | { | 333 | { |
338 | try | 334 | try |