diff options
| author | Melanie | 2011-12-22 16:58:38 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-22 16:58:38 +0000 |
| commit | b72dd852b7cec9b73e8038a66e06d276316845ae (patch) | |
| tree | 9fb6efafc08379d93c872c7cb8d78c7ad8ab34fd | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | And a typo fix (diff) | |
| download | opensim-SC_OLD-b72dd852b7cec9b73e8038a66e06d276316845ae.zip opensim-SC_OLD-b72dd852b7cec9b73e8038a66e06d276316845ae.tar.gz opensim-SC_OLD-b72dd852b7cec9b73e8038a66e06d276316845ae.tar.bz2 opensim-SC_OLD-b72dd852b7cec9b73e8038a66e06d276316845ae.tar.xz | |
Merge branch 'master' into careminster
| -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 88bf695..587ef1c 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2767,7 +2767,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2767 | // If we don't have a PhysActor, we can't cross anyway | 2767 | // If we don't have a PhysActor, we can't cross anyway |
| 2768 | // Also don't do this while sat, sitting avatars cross with the | 2768 | // Also don't do this while sat, sitting avatars cross with the |
| 2769 | // object they sit on. | 2769 | // object they sit on. |
| 2770 | if (ParentID != 0 || PhysActor == null) | 2770 | if (ParentID != 0 || PhysicsActor == null) |
| 2771 | return; | 2771 | return; |
| 2772 | 2772 | ||
| 2773 | if (!IsInTransit) | 2773 | if (!IsInTransit) |