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

Slight change to state management for attach scheduling. 

Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
arthursv
Alan Webb 2009-08-03 23:07:12 -04:00 committed by dr scofield (aka dirk husemann)
parent 9ffe4d850e
commit 068f54725b
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -512,8 +512,8 @@ namespace OpenSim.Region.Framework.Scenes
objatt.HasGroupChanged = true; objatt.HasGroupChanged = true;
// Fire after attach, so we don't get messy perms dialogs // Fire after attach, so we don't get messy perms dialogs
// // 3 == AttachedRez
objatt.CreateScriptInstances(0, true, m_parentScene.DefaultScriptEngine, 0); objatt.CreateScriptInstances(0, true, m_parentScene.DefaultScriptEngine, 3);
} }
return objatt; return objatt;
} }

3
OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
View File

@ -40,7 +40,8 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
{ {
NewRez = 0, NewRez = 0,
PrimCrossing = 1, PrimCrossing = 1,
ScriptedRez = 2 ScriptedRez = 2,
AttachedRez = 3
} }
public interface IScriptWorkItem public interface IScriptWorkItem

17
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -89,8 +89,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
private long m_eventDelayTicks = 0; private long m_eventDelayTicks = 0;
private long m_nextEventTimeTicks = 0; private long m_nextEventTimeTicks = 0;
private bool m_startOnInit = true; 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 StateSource m_stateSource;
private bool m_postOnRez; private bool m_postOnRez;
private bool m_startedFromSavedState = false; private bool m_startedFromSavedState = false;
@ -234,8 +233,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
m_MaxScriptQueue = maxScriptQueue; m_MaxScriptQueue = maxScriptQueue;
m_stateSource = stateSource; m_stateSource = stateSource;
m_postOnRez = postOnRez; m_postOnRez = postOnRez;
m_isAttachment = part.IsAttachment; m_AttachedAvatar = part.AttachedAvatar;
m_attachedAvatar = part.AttachedAvatar;
m_RegionID = part.ParentGroup.Scene.RegionInfo.RegionID; m_RegionID = part.ParentGroup.Scene.RegionInfo.RegionID;
if (part != null) if (part != null)
@ -383,13 +381,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
new Object[] {new LSL_Types.LSLInteger(m_StartParam)}, new DetectParams[0])); new Object[] {new LSL_Types.LSLInteger(m_StartParam)}, new DetectParams[0]));
} }
if (m_isAttachment) if (m_stateSource == StateSource.AttachedRez)
{ {
PostEvent(new EventParams("attach", 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]));
} }
else if (m_stateSource == StateSource.NewRez)
if (m_stateSource == StateSource.NewRez)
{ {
// m_log.Debug("[Script] Posted changed(CHANGED_REGION_RESTART) to script"); // m_log.Debug("[Script] Posted changed(CHANGED_REGION_RESTART) to script");
PostEvent(new EventParams("changed", 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])); new Object[] {new LSL_Types.LSLInteger(m_StartParam)}, new DetectParams[0]));
} }
if (m_isAttachment) if (m_stateSource == StateSource.AttachedRez)
{ {
PostEvent(new EventParams("attach", 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]));
} }
} }