diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-26 11:48:05 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-26 11:48:05 -0400 |
| commit | 54e05a083d2aeb7a892647f64edfd52db80ce5ed (patch) | |
| tree | 1fca51f8dd19c0f4871d8e1b875511c6087b3675 /OpenSim/Region/Physics/POSPlugin/POSCharacter.cs | |
| parent | * It turns out that Physics heightmap values were being stored in managed mem... (diff) | |
| parent | Add reference to OpenMetaverse.dll to UserServer.Modules to make MSVS happy (diff) | |
| download | opensim-SC_OLD-54e05a083d2aeb7a892647f64edfd52db80ce5ed.zip opensim-SC_OLD-54e05a083d2aeb7a892647f64edfd52db80ce5ed.tar.gz opensim-SC_OLD-54e05a083d2aeb7a892647f64edfd52db80ce5ed.tar.bz2 opensim-SC_OLD-54e05a083d2aeb7a892647f64edfd52db80ce5ed.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/POSPlugin/POSCharacter.cs')
| -rw-r--r-- | OpenSim/Region/Physics/POSPlugin/POSCharacter.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs index 1973adf..35fc616 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs | |||
| @@ -43,7 +43,7 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
| 43 | private PhysicsVector _acceleration; | 43 | private PhysicsVector _acceleration; |
| 44 | private PhysicsVector m_rotationalVelocity = PhysicsVector.Zero; | 44 | private PhysicsVector m_rotationalVelocity = PhysicsVector.Zero; |
| 45 | private bool flying; | 45 | private bool flying; |
| 46 | private bool iscolliding; | 46 | private bool isColliding; |
| 47 | 47 | ||
| 48 | public POSCharacter() | 48 | public POSCharacter() |
| 49 | { | 49 | { |
| @@ -116,8 +116,8 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
| 116 | 116 | ||
| 117 | public override bool IsColliding | 117 | public override bool IsColliding |
| 118 | { | 118 | { |
| 119 | get { return iscolliding; } | 119 | get { return isColliding; } |
| 120 | set { iscolliding = value; } | 120 | set { isColliding = value; } |
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | public override bool CollidingGround | 123 | public override bool CollidingGround |