aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs3
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/MicroScheduler.cs4
2 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index 73eb98f..3a6b1b1 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
142 m_scene.Broadcast(delegate(IClientAPI user) 142 m_scene.Broadcast(delegate(IClientAPI user)
143 { 143 {
144 user.SendAlertMessage( 144 user.SendAlertMessage(
145 "MiniRegionModule Compilation and Initialisation failed: " + e); 145 "Compile error while building MRM script, check OpenSim console for more information.");
146 }); 146 });
147 } 147 }
148 } 148 }
@@ -256,6 +256,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
256 } 256 }
257 257
258 libraries.Add("OpenSim.Region.OptionalModules.dll"); 258 libraries.Add("OpenSim.Region.OptionalModules.dll");
259 libraries.Add("OpenMetaverseTypes.dll");
259 libraries.Add("log4net.dll"); 260 libraries.Add("log4net.dll");
260 261
261 foreach (string library in libraries) 262 foreach (string library in libraries)
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MicroScheduler.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MicroScheduler.cs
index 8fd77ee..aaa2848 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MicroScheduler.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MicroScheduler.cs
@@ -28,7 +28,9 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
31using System.Text; 32using System.Text;
33using log4net;
32using OpenSim.Region.OptionalModules.Scripting.Minimodule.Interfaces; 34using OpenSim.Region.OptionalModules.Scripting.Minimodule.Interfaces;
33 35
34namespace OpenSim.Region.OptionalModules.Scripting.Minimodule 36namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
@@ -54,8 +56,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
54 while (m_threads.Count > 0 && i < count) 56 while (m_threads.Count > 0 && i < count)
55 { 57 {
56 i++; 58 i++;
59
57 bool running = m_threads[i%m_threads.Count].MoveNext(); 60 bool running = m_threads[i%m_threads.Count].MoveNext();
58 61
62
59 if (!running) 63 if (!running)
60 m_threads.Remove(m_threads[i%m_threads.Count]); 64 m_threads.Remove(m_threads[i%m_threads.Count]);
61 } 65 }