aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2009-04-10 21:44:27 +0000
committerMelanie Thielker2009-04-10 21:44:27 +0000
commita7de0ae9ec9226760ce134200ee692b825993061 (patch)
tree41cd9c4817a0e01fa066ba2d42432b2a95c34b72 /OpenSim
parentAdd an optional region module which will supply a script event, (diff)
downloadopensim-SC-a7de0ae9ec9226760ce134200ee692b825993061.zip
opensim-SC-a7de0ae9ec9226760ce134200ee692b825993061.tar.gz
opensim-SC-a7de0ae9ec9226760ce134200ee692b825993061.tar.bz2
opensim-SC-a7de0ae9ec9226760ce134200ee692b825993061.tar.xz
Make the scrpt engines ignore any script that begins with //MRM:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs3
2 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
index d05fb51..548b0ac 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
@@ -240,6 +240,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
240 public void OnRezScript(uint localID, UUID itemID, string script, 240 public void OnRezScript(uint localID, UUID itemID, string script,
241 int startParam, bool postOnRez, string engine, int stateSource) 241 int startParam, bool postOnRez, string engine, int stateSource)
242 { 242 {
243 if (script.StartsWith("//MRM:"))
244 return;
245
243 List<IScriptModule> engines = 246 List<IScriptModule> engines =
244 new List<IScriptModule>( 247 new List<IScriptModule>(
245 myScriptEngine.World.RequestModuleInterfaces<IScriptModule>()); 248 myScriptEngine.World.RequestModuleInterfaces<IScriptModule>());
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index a78dad6..037c494 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -353,6 +353,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
353 353
354 public void OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource) 354 public void OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource)
355 { 355 {
356 if (script.StartsWith("//MRM:"))
357 return;
358
356 List<IScriptModule> engines = new List<IScriptModule>(m_Scene.RequestModuleInterfaces<IScriptModule>()); 359 List<IScriptModule> engines = new List<IScriptModule>(m_Scene.RequestModuleInterfaces<IScriptModule>());
357 360
358 List<string> names = new List<string>(); 361 List<string> names = new List<string>();