diff options
author | Melanie | 2012-12-30 03:43:51 +0000 |
---|---|---|
committer | Melanie | 2012-12-30 03:43:51 +0000 |
commit | 7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5 (patch) | |
tree | e2b5b94a95511a6e26c56b611e7b7445c28d119f /OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | BulletSim: remove check for small motor movement because, while it (diff) | |
download | opensim-SC_OLD-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.zip opensim-SC_OLD-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.tar.gz opensim-SC_OLD-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.tar.bz2 opensim-SC_OLD-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs index 96cd55e..c7885c6 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | |||
@@ -205,4 +205,17 @@ public class BSShapeCompound : BSShape | |||
205 | } | 205 | } |
206 | public override void Dereference(BSScene physicsScene) { } | 206 | public override void Dereference(BSScene physicsScene) { } |
207 | } | 207 | } |
208 | |||
209 | public class BSShapeAvatar : BSShape | ||
210 | { | ||
211 | private static string LogHeader = "[BULLETSIM SHAPE AVATAR]"; | ||
212 | public BSShapeAvatar() : base() | ||
213 | { | ||
214 | } | ||
215 | public static BSShape GetReference(BSPhysObject prim) | ||
216 | { | ||
217 | return new BSShapeNull(); | ||
218 | } | ||
219 | public override void Dereference(BSScene physicsScene) { } | ||
220 | } | ||
208 | } | 221 | } |