From 2f70baee528ae94a3456c09ebdb60e9a24d7f7d0 Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Sat, 28 Jun 2008 16:18:47 +0000 Subject: Mantis#1623. Thank you, Melanie for a patch that: Fully defines the equality operators on the lsl types and plubs in the script engine side of the work begun in 0001616 (aly, this one's for you) --- OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine') diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index 008abd0..2d2a06a 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs @@ -62,7 +62,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine // PROVIDE SCRIPT WITH ITS INTERFACE TO OpenSim - public override void _StartScript(uint localID, LLUUID itemID, string Script) + public override void _StartScript(uint localID, LLUUID itemID, string Script, int startParam, bool postOnRez) { m_scriptEngine.Log.Debug("[" + m_scriptEngine.ScriptEngineName + "]: ScriptManager StartScript: localID: " + localID + ", itemID: " + itemID); @@ -114,6 +114,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine //#endif CompiledScript.Source = Script; + CompiledScript.StartParam = startParam; + // Add it to our script memstruct m_scriptEngine.m_ScriptManager.SetScript(localID, itemID, CompiledScript); @@ -130,6 +132,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine int eventFlags = m_scriptEngine.m_ScriptManager.GetStateEventFlags(localID, itemID); m_host.SetScriptEvents(itemID, eventFlags); m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { }); + if(postOnRez) + { + m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "on_rez", EventQueueManager.llDetectNull, new object[] { new LSL_Types.LSLInteger(startParam) }); + } } catch (Exception e) // LEGIT: User Scripting { -- cgit v1.1