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

Implement a workaround solution for saving manual script state changes by the user before logout instead of wrongly removing the script early. 

This workaround relies on the fact that a closing client goes inactive before the attachments derez calls happen.
This reverts the change to remove scripts too early instead of stopping them, since the the two step stop then remove is necessary to execute the detach event.
user_profiles
Justin Clark-Casey (justincc) 2013-01-11 02:28:43 +00:00
parent 05ac6d3209
commit 660d36a5b0
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@ -77,8 +77,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
if (Enabled) if (Enabled)
{ {
m_scene.EventManager.OnNewClient += SubscribeToClientEvents; m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
m_scene.EventManager.OnStartScript += HandleScriptStateChange; m_scene.EventManager.OnStartScript += (localID, itemID) => HandleScriptStateChange(localID, true);
m_scene.EventManager.OnStopScript += HandleScriptStateChange; m_scene.EventManager.OnStopScript += (localID, itemID) => HandleScriptStateChange(localID, false);
} }
// TODO: Should probably be subscribing to CloseClient too, but this doesn't yet give us IClientAPI // TODO: Should probably be subscribing to CloseClient too, but this doesn't yet give us IClientAPI
@ -89,12 +89,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
/// </summary> /// </summary>
/// <param name='localID'></param> /// <param name='localID'></param>
/// <param name='itemID'></param> /// <param name='itemID'></param>
private void HandleScriptStateChange(uint localID, UUID itemID) private void HandleScriptStateChange(uint localID, bool started)
{ {
SceneObjectGroup sog = m_scene.GetGroupByPrim(localID); SceneObjectGroup sog = m_scene.GetGroupByPrim(localID);
if (sog != null && sog.IsAttachment) if (sog != null && sog.IsAttachment)
{
if (!started)
{
// FIXME: This is a convoluted way for working out whether the script state has changed to stop
// because it has been manually stopped or because the stop was called in UpdateDetachedObject() below
// This needs to be handled in a less tangled way.
ScenePresence sp = m_scene.GetScenePresence(sog.AttachedAvatar);
if (sp.ControllingClient.IsActive)
sog.HasGroupChanged = true; sog.HasGroupChanged = true;
} }
else
{
sog.HasGroupChanged = true;
}
}
}
public void RemoveRegion(Scene scene) public void RemoveRegion(Scene scene)
{ {
@ -759,7 +773,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
// Remove the object from the scene so no more updates // Remove the object from the scene so no more updates
// are sent. Doing this before the below changes will ensure // are sent. Doing this before the below changes will ensure
// updates can't cause "HUD artefacts" // updates can't cause "HUD artefacts"
m_scene.DeleteSceneObject(so, false); m_scene.DeleteSceneObject(so, false, false);
// Prepare sog for storage // Prepare sog for storage
so.AttachedAvatar = UUID.Zero; so.AttachedAvatar = UUID.Zero;