diff options
author | Justin Clark-Casey (justincc) | 2011-11-14 15:24:02 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-14 15:24:02 +0000 |
commit | 49ec85ae154a8062e6fcf8bad95ecc3b611e7812 (patch) | |
tree | 837fef3c9287b9875edb4afcda99abfa580dc05c /OpenSim/Region/Framework/Scenes | |
parent | doh - correct build break (diff) | |
download | opensim-SC_OLD-49ec85ae154a8062e6fcf8bad95ecc3b611e7812.zip opensim-SC_OLD-49ec85ae154a8062e6fcf8bad95ecc3b611e7812.tar.gz opensim-SC_OLD-49ec85ae154a8062e6fcf8bad95ecc3b611e7812.tar.bz2 opensim-SC_OLD-49ec85ae154a8062e6fcf8bad95ecc3b611e7812.tar.xz |
Do a ScenePresence null check in HGMessageTransferModule.SendIMToScene() to stop a NullReferenceException being thrown if an HG IM is sent to a simulator running multiple regions
This is an attempt to address http://opensimulator.org/mantis/view.php?id=5791
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 3fee642..9ebb6dd 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2854,6 +2854,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2854 | Velocity = Vector3.Zero; | 2854 | Velocity = Vector3.Zero; |
2855 | AbsolutePosition = pos; | 2855 | AbsolutePosition = pos; |
2856 | 2856 | ||
2857 | // m_log.DebugFormat("[SCENE PRESENCE]: Prevented flyoff for {0} at {1}", Name, AbsolutePosition); | ||
2858 | |||
2857 | AddToPhysicalScene(isFlying); | 2859 | AddToPhysicalScene(isFlying); |
2858 | } | 2860 | } |
2859 | } | 2861 | } |