diff options
Diffstat (limited to 'OpenSim')
5 files changed, 23 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index e4c1229..4e3296c 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | |||
@@ -33,6 +33,9 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
33 | [Serializable] | 33 | [Serializable] |
34 | public class LSL_Types | 34 | public class LSL_Types |
35 | { | 35 | { |
36 | |||
37 | // Types are kept is separate .dll to avoid having to add whatever .dll it is in it to script AppDomain | ||
38 | |||
36 | [Serializable] | 39 | [Serializable] |
37 | public struct Vector3 | 40 | public struct Vector3 |
38 | { | 41 | { |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs index bc241ce..66153a7 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | |||
@@ -36,6 +36,18 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
36 | { | 36 | { |
37 | public class AppDomainManager | 37 | public class AppDomainManager |
38 | { | 38 | { |
39 | |||
40 | // | ||
41 | // This class does AppDomain handling and loading/unloading of scripts in it. | ||
42 | // It is instanced in "ScriptEngine" and controlled from "ScriptManager" | ||
43 | // | ||
44 | // 1. Create a new AppDomain if old one is full (or doesn't exist) | ||
45 | // 2. Load scripts into AppDomain | ||
46 | // 3. Unload scripts from AppDomain (stopping them and marking them as inactive) | ||
47 | // 4. Unload AppDomain completely when all scripts in it has stopped | ||
48 | // | ||
49 | |||
50 | |||
39 | private int maxScriptsPerAppDomain = 1; | 51 | private int maxScriptsPerAppDomain = 1; |
40 | 52 | ||
41 | /// <summary> | 53 | /// <summary> |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Common.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Common.cs index 4594ad8..db9a535 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Common.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Common.cs | |||
@@ -33,6 +33,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
33 | public static bool debug = true; | 33 | public static bool debug = true; |
34 | public static ScriptEngine mySE; | 34 | public static ScriptEngine mySE; |
35 | 35 | ||
36 | // This class just contains some static log stuff used for debugging. | ||
37 | |||
36 | //public delegate void SendToDebugEventDelegate(string Message); | 38 | //public delegate void SendToDebugEventDelegate(string Message); |
37 | //public delegate void SendToLogEventDelegate(string Message); | 39 | //public delegate void SendToLogEventDelegate(string Message); |
38 | //static public event SendToDebugEventDelegate SendToDebugEvent; | 40 | //static public event SendToDebugEventDelegate SendToDebugEvent; |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs index 8e37798..dfdf8f4 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | |||
@@ -33,6 +33,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
33 | { | 33 | { |
34 | public class LSL2CSConverter | 34 | public class LSL2CSConverter |
35 | { | 35 | { |
36 | |||
37 | |||
38 | // Uses regex to convert LSL code to C# code. | ||
39 | |||
36 | //private Regex rnw = new Regex(@"[a-zA-Z0-9_\-]", RegexOptions.Compiled); | 40 | //private Regex rnw = new Regex(@"[a-zA-Z0-9_\-]", RegexOptions.Compiled); |
37 | private Dictionary<string, string> dataTypes = new Dictionary<string, string>(); | 41 | private Dictionary<string, string> dataTypes = new Dictionary<string, string>(); |
38 | private Dictionary<string, string> quotes = new Dictionary<string, string>(); | 42 | private Dictionary<string, string> quotes = new Dictionary<string, string>(); |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs index 82049f7..fabce6a 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | |||
@@ -35,8 +35,9 @@ using OpenSim.Region.Environment.Scenes; | |||
35 | namespace OpenSim.Region.ScriptEngine.DotNetEngine | 35 | namespace OpenSim.Region.ScriptEngine.DotNetEngine |
36 | { | 36 | { |
37 | /// <summary> | 37 | /// <summary> |
38 | /// This is the root object for ScriptEngine | 38 | /// This is the root object for ScriptEngine. Objects access each other trough this class. |
39 | /// </summary> | 39 | /// </summary> |
40 | /// | ||
40 | [Serializable] | 41 | [Serializable] |
41 | public class ScriptEngine : IRegionModule | 42 | public class ScriptEngine : IRegionModule |
42 | { | 43 | { |