diff options
| author | Robert Adams | 2012-12-12 16:29:03 -0800 |
|---|---|---|
| committer | Robert Adams | 2012-12-12 16:51:43 -0800 |
| commit | e1814aa827c2d0af21d087bd34e3c7f4f7cf25bd (patch) | |
| tree | 283bcee9a3320a93e9c252937f754c5962f9a19d /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
| parent | BulletSim: non-functional commenting and reorganization of material attribute... (diff) | |
| download | opensim-SC-e1814aa827c2d0af21d087bd34e3c7f4f7cf25bd.zip opensim-SC-e1814aa827c2d0af21d087bd34e3c7f4f7cf25bd.tar.gz opensim-SC-e1814aa827c2d0af21d087bd34e3c7f4f7cf25bd.tar.bz2 opensim-SC-e1814aa827c2d0af21d087bd34e3c7f4f7cf25bd.tar.xz | |
BulletSim: fix problem of avatar's floating off the ground after unsitting. Reworked size/scale logic so physical scale is kept in Bullet and physObject scale is the preferred size -- usually same as size but avatars are computed differently.
Diffstat (limited to '')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index f3b6993..6539b43 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
| @@ -109,7 +109,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
| 109 | public EntityProperties CurrentEntityProperties { get; set; } | 109 | public EntityProperties CurrentEntityProperties { get; set; } |
| 110 | public EntityProperties LastEntityProperties { get; set; } | 110 | public EntityProperties LastEntityProperties { get; set; } |
| 111 | 111 | ||
| 112 | public abstract OMV.Vector3 Scale { get; set; } | 112 | public virtual OMV.Vector3 Scale { get; set; } |
| 113 | public abstract bool IsSolid { get; } | 113 | public abstract bool IsSolid { get; } |
| 114 | public abstract bool IsStatic { get; } | 114 | public abstract bool IsStatic { get; } |
| 115 | 115 | ||