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

Save attachments on detach/exit if a contained script state has been changed. 

This involves making Attachments module listen for start/stop script changes.
It also involves removing the script from the region on detach in the same manner as every other DeleteSceneObject() call rather than simply stopping it
This is necessary tue to the bad assymetry of start and stop script triggers but it appears to be the correct behaviour anyway, as detached objects are completely gone from the sim.
Not just in a state where their scripts have been stopped.
user_profiles
Justin Clark-Casey (justincc) 2013-01-11 01:46:36 +00:00
parent 26347307ec
commit 05ac6d3209
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,10 +75,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
m_scene.RegisterModuleInterface<IAttachmentsModule>(this);
if (Enabled)
{
m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
m_scene.EventManager.OnStartScript += HandleScriptStateChange;
m_scene.EventManager.OnStopScript += HandleScriptStateChange;
}
// TODO: Should probably be subscribing to CloseClient too, but this doesn't yet give us IClientAPI
}
/// <summary>
/// Listen for client triggered running state changes so that we can persist the script's object if necessary.
/// </summary>
/// <param name='localID'></param>
/// <param name='itemID'></param>
private void HandleScriptStateChange(uint localID, UUID itemID)
{
SceneObjectGroup sog = m_scene.GetGroupByPrim(localID);
if (sog != null && sog.IsAttachment)
sog.HasGroupChanged = true;
}
public void RemoveRegion(Scene scene)
{
@ -743,7 +759,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
// Remove the object from the scene so no more updates
// are sent. Doing this before the below changes will ensure
// updates can't cause "HUD artefacts"
m_scene.DeleteSceneObject(so, false, false);
m_scene.DeleteSceneObject(so, false);
// Prepare sog for storage
so.AttachedAvatar = UUID.Zero;

3
OpenSim/Region/Framework/Scenes/EventManager.cs
View File

@ -339,6 +339,8 @@ namespace OpenSim.Region.Framework.Scenes
/// in <see cref="Scene.SetScriptRunning"/>
/// via <see cref="OpenSim.Framework.IClientAPI.OnSetScriptRunning"/>,
/// via <see cref="OpenSim.Region.ClientStack.LindenUDP.HandleSetScriptRunning"/>
/// XXX: This is only triggered when it is the client that starts the script, not in other situations where
/// a script is started, unlike OnStopScript!
/// </remarks>
public event StartScript OnStartScript;
@ -352,6 +354,7 @@ namespace OpenSim.Region.Framework.Scenes
/// in <see cref="SceneObjectPartInventory.CreateScriptInstance"/>,
/// <see cref="SceneObjectPartInventory.StopScriptInstance"/>,
/// <see cref="Scene.SetScriptRunning"/>
/// XXX: This is triggered when a sciprt is stopped for any reason, unlike OnStartScript!
/// </remarks>
public event StopScript OnStopScript;