diff options
| author | Melanie | 2013-01-25 00:10:32 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-25 00:10:32 +0000 |
| commit | 0b8bf69470aa461ac8b6554dce5e56427f39ac74 (patch) | |
| tree | 9e2175c461425d1abc6ffbdb7d19278a9bf82c2e /OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: reduce the zeroing threshold for rotational velocity. (diff) | |
| download | opensim-SC-0b8bf69470aa461ac8b6554dce5e56427f39ac74.zip opensim-SC-0b8bf69470aa461ac8b6554dce5e56427f39ac74.tar.gz opensim-SC-0b8bf69470aa461ac8b6554dce5e56427f39ac74.tar.bz2 opensim-SC-0b8bf69470aa461ac8b6554dce5e56427f39ac74.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 002e852..9d20c9e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |||
| @@ -31,7 +31,6 @@ using System.Collections.Generic; | |||
| 31 | using System.Globalization; | 31 | using System.Globalization; |
| 32 | using System.Reflection; | 32 | using System.Reflection; |
| 33 | using System.IO; | 33 | using System.IO; |
| 34 | using System.Linq; | ||
| 35 | using System.Text; | 34 | using System.Text; |
| 36 | using Microsoft.CSharp; | 35 | using Microsoft.CSharp; |
| 37 | //using Microsoft.JScript; | 36 | //using Microsoft.JScript; |