diff options
author | Melanie Thielker | 2008-09-26 23:38:59 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-09-26 23:38:59 +0000 |
commit | ec16750a87bffd647ce211b502b709c4a236c45b (patch) | |
tree | d956272070bf29cf7bf62bbd002096a8f09d15d1 | |
parent | And actually do what I intended to do with the last commit. Message is gone. (diff) | |
download | opensim-SC_OLD-ec16750a87bffd647ce211b502b709c4a236c45b.zip opensim-SC_OLD-ec16750a87bffd647ce211b502b709c4a236c45b.tar.gz opensim-SC_OLD-ec16750a87bffd647ce211b502b709c4a236c45b.tar.bz2 opensim-SC_OLD-ec16750a87bffd647ce211b502b709c4a236c45b.tar.xz |
Mantis #2277
Patch up a type name change in libomv. Thanks for tracking that down, idb
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 5cb6106..ec864e1 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 | |||
323 | if (l == enumCompileType.lsl) | 323 | if (l == enumCompileType.lsl) |
324 | { | 324 | { |
325 | // Its LSL, convert it to C# | 325 | // Its LSL, convert it to C# |
326 | //compileScript = LSL_Converter.Convert(Script); | ||
327 | LSL_Converter = (ICodeConverter)new CSCodeGenerator(); | 326 | LSL_Converter = (ICodeConverter)new CSCodeGenerator(); |
328 | compileScript = LSL_Converter.Convert(Script); | 327 | compileScript = LSL_Converter.Convert(Script); |
329 | 328 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs index a794f02..17a864d 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 | |||
421 | if (itemType == "list") | 421 | if (itemType == "list") |
422 | return ReadList(tag); | 422 | return ReadList(tag); |
423 | 423 | ||
424 | if (itemType == "libsecondlife.UUID") | 424 | if (itemType == "OpenMetaverse.UUID") |
425 | { | 425 | { |
426 | UUID val = new UUID(); | 426 | UUID val = new UUID(); |
427 | UUID.TryParse(tag.InnerText, out val); | 427 | UUID.TryParse(tag.InnerText, out val); |