diff options
| author | Melanie | 2011-12-22 16:57:49 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-22 16:57:49 +0000 |
| commit | 7f527814d524fe6b0fb5243dbdb558e5b661e4a5 (patch) | |
| tree | 4a2b93792854080d4c319b8ab67e576d4466aae0 /OpenSim/Region/Framework/Scenes | |
| parent | Add a few comments, correct a merge artefact (diff) | |
| download | opensim-SC-7f527814d524fe6b0fb5243dbdb558e5b661e4a5.zip opensim-SC-7f527814d524fe6b0fb5243dbdb558e5b661e4a5.tar.gz opensim-SC-7f527814d524fe6b0fb5243dbdb558e5b661e4a5.tar.bz2 opensim-SC-7f527814d524fe6b0fb5243dbdb558e5b661e4a5.tar.xz | |
And a typo fix
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index fc6eb6d..3d1c1b5 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2756,7 +2756,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2756 | // If we don't have a PhysActor, we can't cross anyway | 2756 | // If we don't have a PhysActor, we can't cross anyway |
| 2757 | // Also don't do this while sat, sitting avatars cross with the | 2757 | // Also don't do this while sat, sitting avatars cross with the |
| 2758 | // object they sit on. | 2758 | // object they sit on. |
| 2759 | if (ParentID != 0 || PhysActor == null) | 2759 | if (ParentID != 0 || PhysicsActor == null) |
| 2760 | return; | 2760 | return; |
| 2761 | 2761 | ||
| 2762 | if (!IsInTransit) | 2762 | if (!IsInTransit) |