diff options
author | Tedd Hansen | 2008-01-21 12:00:27 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-01-21 12:00:27 +0000 |
commit | da8923450a2682ec3544cd6c814e691fb8cb4428 (patch) | |
tree | 102251f4975953f1787995739a8552d7a51b0bd4 | |
parent | Add additional mainlog data to LogOffUser (diff) | |
download | opensim-SC-da8923450a2682ec3544cd6c814e691fb8cb4428.zip opensim-SC-da8923450a2682ec3544cd6c814e691fb8cb4428.tar.gz opensim-SC-da8923450a2682ec3544cd6c814e691fb8cb4428.tar.bz2 opensim-SC-da8923450a2682ec3544cd6c814e691fb8cb4428.tar.xz |
Small bug in ResetScript
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | 8 |
2 files changed, 1 insertions, 11 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs index 191d3b2..48ac3bb 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | |||
@@ -29,11 +29,7 @@ | |||
29 | using System; | 29 | using System; |
30 | using Nini.Config; | 30 | using Nini.Config; |
31 | using OpenSim.Framework.Console; | 31 | using OpenSim.Framework.Console; |
32 | using OpenSim.Region.Environment.Interfaces; | ||
33 | using OpenSim.Region.Environment.Scenes; | 32 | using OpenSim.Region.Environment.Scenes; |
34 | using OpenSim.Region.ScriptEngine.Common; | ||
35 | using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase; | ||
36 | using EventManager=OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.EventManager; | ||
37 | 33 | ||
38 | namespace OpenSim.Region.ScriptEngine.DotNetEngine | 34 | namespace OpenSim.Region.ScriptEngine.DotNetEngine |
39 | { | 35 | { |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index 3bc64be..5e1b537 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | |||
@@ -27,17 +27,11 @@ | |||
27 | */ | 27 | */ |
28 | /* Original code: Tedd Hansen */ | 28 | /* Original code: Tedd Hansen */ |
29 | using System; | 29 | using System; |
30 | using System.Collections.Generic; | ||
31 | using System.IO; | ||
32 | using System.Reflection; | ||
33 | using System.Runtime.Serialization.Formatters.Binary; | ||
34 | using System.Threading; | ||
35 | using libsecondlife; | 30 | using libsecondlife; |
36 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
37 | using OpenSim.Region.Environment.Scenes; | 32 | using OpenSim.Region.Environment.Scenes; |
38 | using OpenSim.Region.ScriptEngine.Common; | 33 | using OpenSim.Region.ScriptEngine.Common; |
39 | using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase; | 34 | using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase; |
40 | using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL; | ||
41 | 35 | ||
42 | namespace OpenSim.Region.ScriptEngine.DotNetEngine | 36 | namespace OpenSim.Region.ScriptEngine.DotNetEngine |
43 | { | 37 | { |
@@ -86,7 +80,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
86 | Console.WriteLine("Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before); | 80 | Console.WriteLine("Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before); |
87 | #endif | 81 | #endif |
88 | 82 | ||
89 | CompiledScript.Source = ScriptSource; | 83 | CompiledScript.Source = Script; |
90 | // Add it to our script memstruct | 84 | // Add it to our script memstruct |
91 | SetScript(localID, itemID, CompiledScript); | 85 | SetScript(localID, itemID, CompiledScript); |
92 | 86 | ||