aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
diff options
context:
space:
mode:
authorTedd Hansen2007-08-25 15:31:47 +0000
committerTedd Hansen2007-08-25 15:31:47 +0000
commit53be4774b32f6736373c1364c3bd659c977fbb4e (patch)
treec81bbc0d41b375bcc403c574da612d18b038c228 /OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
parentHopefully fixed the bugs in primitives rotation editing (diff)
downloadopensim-SC_OLD-53be4774b32f6736373c1364c3bd659c977fbb4e.zip
opensim-SC_OLD-53be4774b32f6736373c1364c3bd659c977fbb4e.tar.gz
opensim-SC_OLD-53be4774b32f6736373c1364c3bd659c977fbb4e.tar.bz2
opensim-SC_OLD-53be4774b32f6736373c1364c3bd659c977fbb4e.tar.xz
Scripts no longer crash sim after 5 minutes (override InitializeLifetimeService). Loading/Unloading of scripts are now handled in separate thread so server is no delayed because of this. Each script is loaded into a single AppDomain (temporary test for script unload, eats ~15KB more memory for each script). Unload of scripts has been verified to free up memory.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
index ea5500a..986d333 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
62 { 62 {
63 // Add to queue for all scripts in ObjectID object 63 // Add to queue for all scripts in ObjectID object
64 //myScriptEngine.m_logger.Verbose("ScriptEngine", "EventManager Event: touch_start"); 64 //myScriptEngine.m_logger.Verbose("ScriptEngine", "EventManager Event: touch_start");
65 Console.WriteLine("touch_start localID: " + localID); 65 //Console.WriteLine("touch_start localID: " + localID);
66 myScriptEngine.myEventQueueManager.AddToObjectQueue(localID, "touch_start", new object[] { (int)1 }); 66 myScriptEngine.myEventQueueManager.AddToObjectQueue(localID, "touch_start", new object[] { (int)1 });
67 } 67 }
68 public void OnRezScript(uint localID, LLUUID itemID, string script) 68 public void OnRezScript(uint localID, LLUUID itemID, string script)
@@ -85,6 +85,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
85 // Path.Combine("ScriptEngines", "Default.lsl"), 85 // Path.Combine("ScriptEngines", "Default.lsl"),
86 // new OpenSim.Region.Environment.Scenes.Scripting.NullScriptHost() 86 // new OpenSim.Region.Environment.Scenes.Scripting.NullScriptHost()
87 //); 87 //);
88 Console.WriteLine("OnRemoveScript localID: " + localID + " LLUID: " + itemID.ToString());
88 myScriptEngine.myScriptManager.StopScript( 89 myScriptEngine.myScriptManager.StopScript(
89 localID, 90 localID,
90 itemID 91 itemID
@@ -96,7 +97,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
96 // These needs to be hooked up to OpenSim during init of this class 97 // These needs to be hooked up to OpenSim during init of this class
97 // then queued in EventQueueManager. 98 // then queued in EventQueueManager.
98 // When queued in EventQueueManager they need to be LSL compatible (name and params) 99 // When queued in EventQueueManager they need to be LSL compatible (name and params)
99 public void state_entry() { } 100
101 //public void state_entry() { } //
100 public void state_exit() { } 102 public void state_exit() { }
101 //public void touch_start() { } 103 //public void touch_start() { }
102 public void touch() { } 104 public void touch() { }