diff options
| author | Melanie | 2010-02-02 03:56:29 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-02 03:56:29 +0000 |
| commit | d5ed92cf3892c507a31da587deb394e8d5842ed6 (patch) | |
| tree | 270646e8dbf76aec39b83cc77a551ecf9e43f011 /OpenSim/Region/OptionalModules | |
| parent | Small fix for a spurious exception (diff) | |
| parent | Revert "improve locking of m_items in SceneObjectPartInventory" (diff) | |
| download | opensim-SC_OLD-d5ed92cf3892c507a31da587deb394e8d5842ed6.zip opensim-SC_OLD-d5ed92cf3892c507a31da587deb394e8d5842ed6.tar.gz opensim-SC_OLD-d5ed92cf3892c507a31da587deb394e8d5842ed6.tar.bz2 opensim-SC_OLD-d5ed92cf3892c507a31da587deb394e8d5842ed6.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | 2 |
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; |