diff options
| author | John Hurliman | 2009-10-29 02:10:48 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-10-29 02:10:48 -0700 |
| commit | fd2c99f184fa192d316222f90ef76ec8b9726ada (patch) | |
| tree | d5b91646d47c06441e35bfc2ea54db976f73d5de | |
| parent | * Log progress messages when loading OAR files with a lot of assets (diff) | |
| download | opensim-SC-fd2c99f184fa192d316222f90ef76ec8b9726ada.zip opensim-SC-fd2c99f184fa192d316222f90ef76ec8b9726ada.tar.gz opensim-SC-fd2c99f184fa192d316222f90ef76ec8b9726ada.tar.bz2 opensim-SC-fd2c99f184fa192d316222f90ef76ec8b9726ada.tar.xz | |
Fixing NullReferenceException regression in the previous commit
| -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 91044be..7420134 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2367,7 +2367,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2367 | 2367 | ||
| 2368 | if (m_isChildAgent == false) | 2368 | if (m_isChildAgent == false) |
| 2369 | { | 2369 | { |
| 2370 | Vector3 velocity = m_physicsActor.Velocity; | 2370 | Vector3 velocity = (m_physicsActor != null) ? m_physicsActor.Velocity : Vector3.Zero; |
| 2371 | 2371 | ||
| 2372 | // Throw away duplicate or insignificant updates | 2372 | // Throw away duplicate or insignificant updates |
| 2373 | if (!m_bodyRot.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) || | 2373 | if (!m_bodyRot.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) || |