OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make scenepresence IDisposable

master
UbitUmarov 2020-05-14 13:36:27 +01:00
parent 67bc086782
commit 5848d3a6bb
2 changed files with 53 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -3794,7 +3794,7 @@ namespace OpenSim.Region.Framework.Scenes
m_sceneGraph.RemoveScenePresence(agentID); m_sceneGraph.RemoveScenePresence(agentID);
m_clientManager.Remove(agentID); m_clientManager.Remove(agentID);
avatar.Close(); avatar.Dispose();
} }
catch (Exception e) catch (Exception e)
{ {

80
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -74,7 +74,7 @@ namespace OpenSim.Region.Framework.Scenes
public delegate void SendCoarseLocationsMethod(UUID scene, ScenePresence presence, List<Vector3> coarseLocations, List<UUID> avatarUUIDs); public delegate void SendCoarseLocationsMethod(UUID scene, ScenePresence presence, List<Vector3> coarseLocations, List<UUID> avatarUUIDs);
public class ScenePresence : EntityBase, IScenePresence public class ScenePresence : EntityBase, IScenePresence, IDisposable
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@ -1075,8 +1075,7 @@ namespace OpenSim.Region.Framework.Scenes
#region Constructor(s) #region Constructor(s)
public ScenePresence( public ScenePresence(IClientAPI client, Scene world, AvatarAppearance appearance, PresenceType type)
IClientAPI client, Scene world, AvatarAppearance appearance, PresenceType type)
{ {
m_scene = world; m_scene = world;
AttachmentsSyncLock = new Object(); AttachmentsSyncLock = new Object();
@ -1167,6 +1166,55 @@ namespace OpenSim.Region.Framework.Scenes
ControllingClient.RefreshGroupMembership(); ControllingClient.RefreshGroupMembership();
} }
~ScenePresence()
{
Dispose(false);
}
private bool disposed = false;
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
protected void Dispose(bool disposing)
{
// Check to see if Dispose has already been called.
if (!disposed)
{
IsDeleted = true;
if (m_updateAgentReceivedAfterTransferEvent != null)
{
m_updateAgentReceivedAfterTransferEvent.Dispose();
m_updateAgentReceivedAfterTransferEvent = null;
}
RemoveFromPhysicalScene();
// Clear known regions
KnownRegions = null;
m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
RemoveClientEvents();
Animator = null;
Appearance = null;
if(m_attachments != null)
{
foreach(SceneObjectGroup sog in m_attachments)
sog.Dispose();
m_attachments = null;
}
scriptedcontrols.Clear();
ControllingClient = null;
LifecycleState = ScenePresenceState.Removed;
disposed = true;
}
}
private float lastHealthSent = 0; private float lastHealthSent = 0;
private void RegionHeartbeatEnd(Scene scene) private void RegionHeartbeatEnd(Scene scene)
@ -1687,6 +1735,7 @@ namespace OpenSim.Region.Framework.Scenes
pa.OnCollisionUpdate -= PhysicsCollisionUpdate; pa.OnCollisionUpdate -= PhysicsCollisionUpdate;
pa.UnSubscribeEvents(); pa.UnSubscribeEvents();
m_scene.PhysicsScene.RemoveAvatar(pa); m_scene.PhysicsScene.RemoveAvatar(pa);
pa = null;
} }
// else // else
// { // {
@ -5391,31 +5440,6 @@ namespace OpenSim.Region.Framework.Scenes
ControllingClient.SendHealth(Health); ControllingClient.SendHealth(Health);
} }
protected internal void Close()
{
// Clear known regions
KnownRegions = new Dictionary<ulong, string>();
// I don't get it but mono crashes when you try to dispose of this timer,
// unsetting the elapsed callback should be enough to allow for cleanup however.
// m_reprioritizationTimer.Dispose();
RemoveFromPhysicalScene();
m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
RemoveClientEvents();
// if (Animator != null)
// Animator.Close();
Animator = null;
scriptedcontrols.Clear();
ControllingClient = null;
LifecycleState = ScenePresenceState.Removed;
IsDeleted = true;
m_updateAgentReceivedAfterTransferEvent.Dispose();
m_updateAgentReceivedAfterTransferEvent = null;
}
public void AddAttachment(SceneObjectGroup gobj) public void AddAttachment(SceneObjectGroup gobj)
{ {