diff options
author | Melanie | 2011-12-10 15:28:32 +0100 |
---|---|---|
committer | Melanie | 2011-12-10 15:28:32 +0100 |
commit | 323ffd7a893e76f097487c1ab461923d996dc1ca (patch) | |
tree | ad1e20397db5d21d58c7132888e6655641d5a306 /OpenSim/Region/Framework/Scenes | |
parent | Prevent spurious error message when client tries to move a null item (diff) | |
download | opensim-SC-323ffd7a893e76f097487c1ab461923d996dc1ca.zip opensim-SC-323ffd7a893e76f097487c1ab461923d996dc1ca.tar.gz opensim-SC-323ffd7a893e76f097487c1ab461923d996dc1ca.tar.bz2 opensim-SC-323ffd7a893e76f097487c1ab461923d996dc1ca.tar.xz |
Fix a regression that causes data from the attachments module to fail loading
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 8ff804b..4034621 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1058,6 +1058,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1058 | if (PhysicsActor != null) | 1058 | if (PhysicsActor != null) |
1059 | isFlying = PhysicsActor.Flying; | 1059 | isFlying = PhysicsActor.Flying; |
1060 | 1060 | ||
1061 | m_log.DebugFormat("[SCENE PRESENCCE]: Local teleport, flying = {0}", isFlying); | ||
1061 | RemoveFromPhysicalScene(); | 1062 | RemoveFromPhysicalScene(); |
1062 | Velocity = Vector3.Zero; | 1063 | Velocity = Vector3.Zero; |
1063 | CheckLandingPoint(ref pos); | 1064 | CheckLandingPoint(ref pos); |