diff options
| author | teravus | 2012-11-15 09:46:41 -0500 |
|---|---|---|
| committer | teravus | 2012-11-15 09:46:41 -0500 |
| commit | dfac269032300872c4d0dc507f4f9062d102b0f4 (patch) | |
| tree | d60fca83f54417c349c33b46de6ac65748ff762f /OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |
| parent | * Fixes mesh loading issues in last commit. (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.zip opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.gz opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.bz2 opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.xz | |
Merge master into teravuswork
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 17a0d69..03be2ab 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |||
| @@ -546,6 +546,8 @@ 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")); | ||
| 549 | 551 | ||
| 550 | if (lang == enumCompileType.yp) | 552 | if (lang == enumCompileType.yp) |
| 551 | { | 553 | { |