ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie Thielker
2010-08-14 14:00:12 +02:00
parent a32b0ce0ae 042eb80a62
commit f2d7f3e731
6 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3335,7 +3335,9 @@ namespace OpenSim.Region.Framework.Scenes
m_sceneGridService.SendCloseChildAgentConnections(agentID, regions);
}
m_log.Debug("[Scene] Beginning ClientClosed");
m_eventManager.TriggerClientClosed(agentID, this);
m_log.Debug("[Scene] Finished ClientClosed");
}
catch (NullReferenceException)
{
@@ -3343,7 +3345,9 @@ namespace OpenSim.Region.Framework.Scenes
// Avatar is already disposed :/
}
m_log.Debug("[Scene] Beginning OnRemovePresence");
m_eventManager.TriggerOnRemovePresence(agentID);
m_log.Debug("[Scene] Finished OnRemovePresence");
ForEachClient(
delegate(IClientAPI client)
{
@@ -3359,8 +3363,11 @@ namespace OpenSim.Region.Framework.Scenes
}
// Remove the avatar from the scene
m_log.Debug("[Scene] Begin RemoveScenePresence");
m_sceneGraph.RemoveScenePresence(agentID);
m_log.Debug("[Scene] Finished RemoveScenePresence. Removing the client manager");
m_clientManager.Remove(agentID);
m_log.Debug("[Scene] Removed the client manager. Firing avatar.close");
try
{
@@ -3374,9 +3381,9 @@ namespace OpenSim.Region.Framework.Scenes
{
m_log.Error("[SCENE] Scene.cs:RemoveClient exception: " + e.ToString());
}
m_log.Debug("[Scene] Done. Firing RemoveCircuit");
m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode);
m_log.Debug("[Scene] The avatar has left the building");
//m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false));
//m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true));
}

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

@@ -1827,7 +1827,7 @@ namespace OpenSim.Region.Framework.Scenes
// which stops client-side interpolation of deactivated joint proxy objects.
}
if (!UsePhysics)
if (!UsePhysics && !isNew)
{
// reset velocity to 0 on physics switch-off. Without that, the client thinks the
// prim still has velocity and continues to interpolate its position along the old