aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-01-30 00:15:37 +0000
committerJustin Clark-Casey (justincc)2010-01-30 00:15:37 +0000
commit4c1365f1496b2c60c313b6d221362d3e09a8c1d4 (patch)
tree15cb401a30f365af21141f1570bbca1b4ddb57d7 /OpenSim/Region
parentApply http://opensimulator.org/mantis/view.php?id=4504 (diff)
downloadopensim-SC_OLD-4c1365f1496b2c60c313b6d221362d3e09a8c1d4.zip
opensim-SC_OLD-4c1365f1496b2c60c313b6d221362d3e09a8c1d4.tar.gz
opensim-SC_OLD-4c1365f1496b2c60c313b6d221362d3e09a8c1d4.tar.bz2
opensim-SC_OLD-4c1365f1496b2c60c313b6d221362d3e09a8c1d4.tar.xz
apply http://opensimulator.org/mantis/view.php?id=4486
fix compilation of mrm scripts using microthreaded parmeter Thanks ziah
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index 4521f8e..f2adcb7 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
116 116
117 static string ConvertMRMKeywords(string script) 117 static string ConvertMRMKeywords(string script)
118 { 118 {
119 script = script.Replace("microthreaded void ", "IEnumerable"); 119 script = script.Replace("microthreaded void", "IEnumerable");
120 script = script.Replace("relax;", "yield return null;"); 120 script = script.Replace("relax;", "yield return null;");
121 121
122 return script; 122 return script;