diff options
author | Melanie Thielker | 2008-11-09 19:30:40 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-09 19:30:40 +0000 |
commit | 664e8a464e4608afeb590a3330ccc69e7988138b (patch) | |
tree | 099c17a1769a7e7ac16232c5a20f5d9515a1d480 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
parent | Cause llGetInventoryType to return the asset type, which corresponds with (diff) | |
download | opensim-SC_OLD-664e8a464e4608afeb590a3330ccc69e7988138b.zip opensim-SC_OLD-664e8a464e4608afeb590a3330ccc69e7988138b.tar.gz opensim-SC_OLD-664e8a464e4608afeb590a3330ccc69e7988138b.tar.bz2 opensim-SC_OLD-664e8a464e4608afeb590a3330ccc69e7988138b.tar.xz |
Script region crossing. This has not user functionality, but lays all the
groundwork.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 221562e..6584bb3 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -333,7 +333,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
333 | get { return false; } | 333 | get { return false; } |
334 | } | 334 | } |
335 | 335 | ||
336 | public void OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine) | 336 | public void OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource) |
337 | { | 337 | { |
338 | List<IScriptModule> engines = new List<IScriptModule>(m_Scene.RequestModuleInterfaces<IScriptModule>()); | 338 | List<IScriptModule> engines = new List<IScriptModule>(m_Scene.RequestModuleInterfaces<IScriptModule>()); |
339 | 339 | ||
@@ -388,7 +388,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
388 | if (engine != ScriptEngineName) | 388 | if (engine != ScriptEngineName) |
389 | return; | 389 | return; |
390 | 390 | ||
391 | Object[] parms = new Object[]{localID, itemID, script, startParam, postOnRez}; | 391 | Object[] parms = new Object[]{localID, itemID, script, startParam, postOnRez, (StateSource)stateSource}; |
392 | 392 | ||
393 | lock (m_CompileQueue) | 393 | lock (m_CompileQueue) |
394 | { | 394 | { |
@@ -471,6 +471,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
471 | string script =(string)p[2]; | 471 | string script =(string)p[2]; |
472 | int startParam = (int)p[3]; | 472 | int startParam = (int)p[3]; |
473 | bool postOnRez = (bool)p[4]; | 473 | bool postOnRez = (bool)p[4]; |
474 | StateSource stateSource = (StateSource)p[5]; | ||
474 | 475 | ||
475 | // Get the asset ID of the script, so we can check if we | 476 | // Get the asset ID of the script, so we can check if we |
476 | // already have it. | 477 | // already have it. |
@@ -505,8 +506,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
505 | { | 506 | { |
506 | assembly = m_Compiler.PerformScriptCompile(script, | 507 | assembly = m_Compiler.PerformScriptCompile(script, |
507 | assetID.ToString()); | 508 | assetID.ToString()); |
508 | if (presence != null && (!postOnRez)) | ||
509 | presence.ControllingClient.SendAgentAlertMessage("Compile successful", false); | ||
510 | } | 509 | } |
511 | catch (Exception e) | 510 | catch (Exception e) |
512 | { | 511 | { |
@@ -584,7 +583,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
584 | m_AppDomains[appDomain], | 583 | m_AppDomains[appDomain], |
585 | part.ParentGroup.RootPart.Name, | 584 | part.ParentGroup.RootPart.Name, |
586 | item.Name, startParam, postOnRez, | 585 | item.Name, startParam, postOnRez, |
587 | StateSource.NewRez, m_MaxScriptQueue); | 586 | stateSource, m_MaxScriptQueue); |
588 | 587 | ||
589 | m_log.DebugFormat("[XEngine] Loaded script {0}.{1}", | 588 | m_log.DebugFormat("[XEngine] Loaded script {0}.{1}", |
590 | part.ParentGroup.RootPart.Name, item.Name); | 589 | part.ParentGroup.RootPart.Name, item.Name); |