From ec16750a87bffd647ce211b502b709c4a236c45b Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Fri, 26 Sep 2008 23:38:59 +0000 Subject: [PATCH] Mantis #2277 Patch up a type name change in libomv. Thanks for tracking that down, idb --- OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 1 - OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 5cb6106450..ec864e196e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs @@ -323,7 +323,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools if (l == enumCompileType.lsl) { // Its LSL, convert it to C# - //compileScript = LSL_Converter.Convert(Script); LSL_Converter = (ICodeConverter)new CSCodeGenerator(); compileScript = LSL_Converter.Convert(Script); diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs index a794f02861..17a864deab 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs @@ -421,7 +421,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance if (itemType == "list") return ReadList(tag); - if (itemType == "libsecondlife.UUID") + if (itemType == "OpenMetaverse.UUID") { UUID val = new UUID(); UUID.TryParse(tag.InnerText, out val);