diff options
author | Teravus Ovares (Dan Olivares) | 2009-11-30 14:03:20 -0500 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-11-30 14:03:20 -0500 |
commit | 83694e557812613bc6325cb6676625e5fa02b232 (patch) | |
tree | c886b03e2f4434f0bb03c269b29c81f9ee718316 /OpenSim/Region/Framework/Scenes | |
parent | * Modified ScenePresence to use the Util version of the EnvironmentTickCount ... (diff) | |
download | opensim-SC-83694e557812613bc6325cb6676625e5fa02b232.zip opensim-SC-83694e557812613bc6325cb6676625e5fa02b232.tar.gz opensim-SC-83694e557812613bc6325cb6676625e5fa02b232.tar.bz2 opensim-SC-83694e557812613bc6325cb6676625e5fa02b232.tar.xz |
* Add a close method to the ScenePresenceAnimator that dereferences the class variables and make the ScenePresence Close method call it.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index b37249d..bbd445d 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
@@ -443,5 +443,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
443 | 443 | ||
444 | SendAnimPack(animIDs, sequenceNums, objectIDs); | 444 | SendAnimPack(animIDs, sequenceNums, objectIDs); |
445 | } | 445 | } |
446 | |||
447 | public void Close() | ||
448 | { | ||
449 | m_animations = null; | ||
450 | m_scenePresence = null; | ||
451 | } | ||
446 | } | 452 | } |
447 | } \ No newline at end of file | 453 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 5b97eb5..46a9ad1 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3047,7 +3047,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
3047 | 3047 | ||
3048 | m_sceneViewer.Close(); | 3048 | m_sceneViewer.Close(); |
3049 | 3049 | ||
3050 | RemoveFromPhysicalScene(); | 3050 | RemoveFromPhysicalScene(); |
3051 | m_animator.Close(); | ||
3052 | m_animator = null; | ||
3051 | } | 3053 | } |
3052 | 3054 | ||
3053 | public ScenePresence() | 3055 | public ScenePresence() |