diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs index a7fa502..b71932e 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs | |||
| @@ -46,7 +46,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces | |||
| 46 | /// <param name="assembly"></param> | 46 | /// <param name="assembly"></param> |
| 47 | /// <param name="linemap"></param> | 47 | /// <param name="linemap"></param> |
| 48 | void PerformScriptCompile( | 48 | void PerformScriptCompile( |
| 49 | string source, string asset, UUID ownerID, | 49 | string source, string asset, UUID ownerID, |
| 50 | out string assembly, out Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap); | 50 | out string assembly, out Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap); |
| 51 | 51 | ||
| 52 | /// <summary> | 52 | /// <summary> |