aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-26 15:34:23 +0000
committerMelanie Thielker2008-09-26 15:34:23 +0000
commit12a6b7c835cae71e87352a48087c253e8c147c38 (patch)
tree52b9d26b7cb62e0b1ae1a6a6f5db42dabe511899 /OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
parent* minor: fix lolbug in RestInventoryService spotted by jhurliman (diff)
downloadopensim-SC_OLD-12a6b7c835cae71e87352a48087c253e8c147c38.zip
opensim-SC_OLD-12a6b7c835cae71e87352a48087c253e8c147c38.tar.gz
opensim-SC_OLD-12a6b7c835cae71e87352a48087c253e8c147c38.tar.bz2
opensim-SC_OLD-12a6b7c835cae71e87352a48087c253e8c147c38.tar.xz
Yay! Common/ is gone! One API is achieved!
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 99f61cd..32e1df1 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -31,13 +31,14 @@ using log4net;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Environment.Scenes;
34using OpenSim.Region.ScriptEngine.Common; 34using OpenSim.Region.ScriptEngine.Interfaces;
35using OpenSim.Region.ScriptEngine.Shared; 35using OpenSim.Region.ScriptEngine.Shared;
36using OpenSim.Region.ScriptEngine.Shared.Api; 36using OpenSim.Region.ScriptEngine.Shared.Api;
37using System.Collections.Generic; 37using System.Collections.Generic;
38using System.IO; 38using System.IO;
39using System.Runtime.Serialization.Formatters.Binary; 39using System.Runtime.Serialization.Formatters.Binary;
40using System.Threading; 40using System.Threading;
41using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
41 42
42namespace OpenSim.Region.ScriptEngine.DotNetEngine 43namespace OpenSim.Region.ScriptEngine.DotNetEngine
43{ 44{
@@ -446,7 +447,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
446 447
447 detparms[id] = qParams; 448 detparms[id] = qParams;
448 if (id.Running) 449 if (id.Running)
449 id.Script.Exec.ExecuteEvent(id.State, FunctionName, args); 450 id.Script.ExecuteEvent(id.State, FunctionName, args);
450 detparms.Remove(id); 451 detparms.Remove(id);
451 } 452 }
452 453
@@ -470,8 +471,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
470 { 471 {
471 return 0; 472 return 0;
472 } 473 }
473 ExecutorBase.scriptEvents evflags = 474 int evflags = id.Script.GetStateEventFlags(id.State);
474 id.Script.Exec.GetStateEventFlags(id.State); 475
475 return (int)evflags; 476 return (int)evflags;
476 } 477 }
477 catch (Exception) 478 catch (Exception)