aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
diff options
context:
space:
mode:
authorRobert Adams2012-10-19 15:43:31 -0700
committerRobert Adams2012-10-19 15:43:31 -0700
commitd94c4646ccf0703019dd5a7915afb43706a4de35 (patch)
treea9fbf5947a8a0d06b9a07ad3be7d42dd672ebc4a /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
parentBulletSim: reorder avatar collision checking to eliminate double collision_end. (diff)
downloadopensim-SC_OLD-d94c4646ccf0703019dd5a7915afb43706a4de35.zip
opensim-SC_OLD-d94c4646ccf0703019dd5a7915afb43706a4de35.tar.gz
opensim-SC_OLD-d94c4646ccf0703019dd5a7915afb43706a4de35.tar.bz2
opensim-SC_OLD-d94c4646ccf0703019dd5a7915afb43706a4de35.tar.xz
BulletSim: add asset fetching so BulletSim works with new physics asset handling.
Refactor some names to make them available for the asset tracking and fetching.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index fc4526b..623ac8f 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -200,10 +200,9 @@ public class BSCharacter : BSPhysObject
200 } 200 }
201 } 201 }
202 public override OMV.Vector3 Scale { get; set; } 202 public override OMV.Vector3 Scale { get; set; }
203 private PrimitiveBaseShape _pbs;
204 public override PrimitiveBaseShape Shape 203 public override PrimitiveBaseShape Shape
205 { 204 {
206 set { _pbs = value;} 205 set { BaseShape = value; }
207 } 206 }
208 207
209 public override bool Grabbed { 208 public override bool Grabbed {