From 068f54725ba5cc658257b5e0f4b9d7c51638c376 Mon Sep 17 00:00:00 2001 From: Alan Webb Date: Mon, 3 Aug 2009 23:07:12 -0400 Subject: Slight change to state management for attach scheduling. Signed-off-by: dr scofield (aka dirk husemann) --- OpenSim/Region/Framework/Scenes/SceneGraph.cs | 4 ++-- .../Region/ScriptEngine/Interfaces/IScriptInstance.cs | 3 ++- .../ScriptEngine/Shared/Instance/ScriptInstance.cs | 17 +++++++---------- 3 files changed, 11 insertions(+), 13 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 5752a88..0e0999a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs @@ -512,8 +512,8 @@ namespace OpenSim.Region.Framework.Scenes objatt.HasGroupChanged = true; // Fire after attach, so we don't get messy perms dialogs - // - objatt.CreateScriptInstances(0, true, m_parentScene.DefaultScriptEngine, 0); + // 3 == AttachedRez + objatt.CreateScriptInstances(0, true, m_parentScene.DefaultScriptEngine, 3); } return objatt; } diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs index c2fce2f..f49aea8 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs @@ -40,7 +40,8 @@ namespace OpenSim.Region.ScriptEngine.Interfaces { NewRez = 0, PrimCrossing = 1, - ScriptedRez = 2 + ScriptedRez = 2, + AttachedRez = 3 } public interface IScriptWorkItem diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 586f926..8168300 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs @@ -89,8 +89,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance private long m_eventDelayTicks = 0; private long m_nextEventTimeTicks = 0; private bool m_startOnInit = true; - private bool m_isAttachment = false; - private UUID m_attachedAvatar = UUID.Zero; + private UUID m_AttachedAvatar = UUID.Zero; private StateSource m_stateSource; private bool m_postOnRez; private bool m_startedFromSavedState = false; @@ -234,8 +233,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance m_MaxScriptQueue = maxScriptQueue; m_stateSource = stateSource; m_postOnRez = postOnRez; - m_isAttachment = part.IsAttachment; - m_attachedAvatar = part.AttachedAvatar; + m_AttachedAvatar = part.AttachedAvatar; m_RegionID = part.ParentGroup.Scene.RegionInfo.RegionID; if (part != null) @@ -383,13 +381,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance new Object[] {new LSL_Types.LSLInteger(m_StartParam)}, new DetectParams[0])); } - if (m_isAttachment) + if (m_stateSource == StateSource.AttachedRez) { PostEvent(new EventParams("attach", - new object[] { new LSL_Types.LSLString(m_attachedAvatar.ToString()) }, new DetectParams[0])); + new object[] { new LSL_Types.LSLString(m_AttachedAvatar.ToString()) }, new DetectParams[0])); } - - if (m_stateSource == StateSource.NewRez) + else if (m_stateSource == StateSource.NewRez) { // m_log.Debug("[Script] Posted changed(CHANGED_REGION_RESTART) to script"); PostEvent(new EventParams("changed", @@ -413,10 +410,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance new Object[] {new LSL_Types.LSLInteger(m_StartParam)}, new DetectParams[0])); } - if (m_isAttachment) + if (m_stateSource == StateSource.AttachedRez) { PostEvent(new EventParams("attach", - new object[] { new LSL_Types.LSLString(m_attachedAvatar.ToString()) }, new DetectParams[0])); + new object[] { new LSL_Types.LSLString(m_AttachedAvatar.ToString()) }, new DetectParams[0])); } } -- cgit v1.1