diff options
| author | teravus | 2012-11-15 10:05:16 -0500 |
|---|---|---|
| committer | teravus | 2012-11-15 10:05:16 -0500 |
| commit | e9153e1d1aae50024d8cd05fe14a9bce34343a0e (patch) | |
| tree | bc111d34f95a26b99c7e34d9e495dc14d1802cc3 /OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |
| parent | Merge master into teravuswork (diff) | |
| download | opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.zip opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.gz opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.bz2 opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.xz | |
Revert "Merge master into teravuswork", it should have been avination, not master.
This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 03be2ab..17a0d69 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |||
| @@ -546,8 +546,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
| 546 | "OpenSim.Region.ScriptEngine.Shared.dll")); | 546 | "OpenSim.Region.ScriptEngine.Shared.dll")); |
| 547 | parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, | 547 | parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, |
| 548 | "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll")); | 548 | "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll")); |
| 549 | parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, | ||
| 550 | "OpenMetaverseTypes.dll")); | ||
| 551 | 549 | ||
| 552 | if (lang == enumCompileType.yp) | 550 | if (lang == enumCompileType.yp) |
| 553 | { | 551 | { |