diff options
| author | Justin Clark-Casey (justincc) | 2012-03-09 02:44:08 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-03-09 02:44:08 +0000 |
| commit | 205c36d3a4bb6fe0aca5027e8e7e36fc57c6de1c (patch) | |
| tree | 18caccf6bb619163883c32c53f601c2f6557429b /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Use SP.ParentPart instead of ParentID in places where it's more efficient (sa... (diff) | |
| download | opensim-SC_OLD-205c36d3a4bb6fe0aca5027e8e7e36fc57c6de1c.zip opensim-SC_OLD-205c36d3a4bb6fe0aca5027e8e7e36fc57c6de1c.tar.gz opensim-SC_OLD-205c36d3a4bb6fe0aca5027e8e7e36fc57c6de1c.tar.bz2 opensim-SC_OLD-205c36d3a4bb6fe0aca5027e8e7e36fc57c6de1c.tar.xz | |
Get rid of unnecessary ParentID == 0 check on SP.Get_AbsolutePosition since this is handled by the necessary ParentPart check
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index aab0bf0..b84660a 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -432,7 +432,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 432 | { | 432 | { |
| 433 | get | 433 | get |
| 434 | { | 434 | { |
| 435 | if (PhysicsActor != null && ParentID == 0) | 435 | if (PhysicsActor != null) |
| 436 | { | 436 | { |
| 437 | m_pos = PhysicsActor.Position; | 437 | m_pos = PhysicsActor.Position; |
| 438 | 438 | ||
| @@ -477,7 +477,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 477 | } | 477 | } |
| 478 | } | 478 | } |
| 479 | 479 | ||
| 480 | // Don't update while sitting | 480 | // Don't update while sitting. The PhysicsActor above is null whilst sitting. |
| 481 | if (ParentID == 0) | 481 | if (ParentID == 0) |
| 482 | { | 482 | { |
| 483 | m_pos = value; | 483 | m_pos = value; |