diff options
| author | dan miller | 2007-09-27 23:06:24 +0000 |
|---|---|---|
| committer | dan miller | 2007-09-27 23:06:24 +0000 |
| commit | 129d266867d0eef6026117afb1462c60179ad365 (patch) | |
| tree | 0a245b6083cc16387693e155b601ad2dc985a260 /OpenSim/Region/Environment | |
| parent | Reverting back to 2017 since 2018 were causing Linux breakage; reopening Tlei... (diff) | |
| download | opensim-SC_OLD-129d266867d0eef6026117afb1462c60179ad365.zip opensim-SC_OLD-129d266867d0eef6026117afb1462c60179ad365.tar.gz opensim-SC_OLD-129d266867d0eef6026117afb1462c60179ad365.tar.bz2 opensim-SC_OLD-129d266867d0eef6026117afb1462c60179ad365.tar.xz | |
this should fix mantis #443
Diffstat (limited to 'OpenSim/Region/Environment')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index e6b8364..b5bb951 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
| @@ -352,8 +352,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 352 | 352 | ||
| 353 | private void RemoveFromPhysicalScene() | 353 | private void RemoveFromPhysicalScene() |
| 354 | { | 354 | { |
| 355 | m_scene.PhysScene.RemoveAvatar( this.PhysicsActor ); | 355 | if (this.PhysicsActor) |
| 356 | this.PhysicsActor = null; | 356 | { |
| 357 | m_scene.PhysScene.RemoveAvatar(this.PhysicsActor); | ||
| 358 | this.PhysicsActor = null; | ||
| 359 | } | ||
| 357 | } | 360 | } |
| 358 | 361 | ||
| 359 | /// <summary> | 362 | /// <summary> |
| @@ -919,4 +922,4 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 919 | RemoveFromPhysicalScene(); | 922 | RemoveFromPhysicalScene(); |
| 920 | } | 923 | } |
| 921 | } | 924 | } |
| 922 | } \ No newline at end of file | 925 | } |