From 08331f97d37f278267002a050b1d2c75a960c03c Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Fri, 13 Jul 2007 17:53:11 +0000 Subject: [PATCH] * Reorganising Java Virtual Machine code into a subfolder for the JVM specific parts, leaving the JVMEngine folder specifically for Script/IScript interfaces. * Fixed a compile issue with the Interpreted Scripts API. --- .../scripting/Engines/JVMEngine/{ => JVM}/ClassInstance.cs | 0 .../scripting/Engines/JVMEngine/{ => JVM}/ClassRecord.cs | 0 .../Scenes/scripting/Engines/JVMEngine/{ => JVM}/Heap.cs | 0 .../Engines/JVMEngine/{ => JVM}/Interpreter.Logic.cs | 0 .../Engines/JVMEngine/{ => JVM}/Interpreter.Methods.cs | 0 .../Engines/JVMEngine/{ => JVM}/Interpreter.Return.cs | 0 .../scripting/Engines/JVMEngine/{ => JVM}/Interpreter.cs | 0 .../scripting/Engines/JVMEngine/{ => JVM}/MainMemory.cs | 0 .../scripting/Engines/JVMEngine/{ => JVM}/MethodMemory.cs | 0 .../Scenes/scripting/Engines/JVMEngine/{ => JVM}/Object.cs | 0 .../Scenes/scripting/Engines/JVMEngine/{ => JVM}/Stack.cs | 0 .../scripting/Engines/JVMEngine/{ => JVM}/StackFrame.cs | 0 .../Scenes/scripting/Engines/JVMEngine/{ => JVM}/Thread.cs | 0 .../Environment/Scenes/scripting/ScriptInterpretedAPI.cs | 4 ++-- 14 files changed, 2 insertions(+), 2 deletions(-) rename OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/{ => JVM}/ClassInstance.cs (100%) rename OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/{ => JVM}/ClassRecord.cs (100%) rename OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/{ => JVM}/Heap.cs (100%) rename OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/{ => JVM}/Interpreter.Logic.cs (100%) rename OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/{ => JVM}/Interpreter.Methods.cs (100%) rename OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/{ => JVM}/Interpreter.Return.cs (100%) rename OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/{ => JVM}/Interpreter.cs (100%) rename OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/{ => JVM}/MainMemory.cs (100%) rename OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/{ => JVM}/MethodMemory.cs (100%) rename OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/{ => JVM}/Object.cs (100%) rename OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/{ => JVM}/Stack.cs (100%) rename OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/{ => JVM}/StackFrame.cs (100%) rename OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/{ => JVM}/Thread.cs (100%) diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/ClassInstance.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/ClassInstance.cs similarity index 100% rename from OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/ClassInstance.cs rename to OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/ClassInstance.cs diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/ClassRecord.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/ClassRecord.cs similarity index 100% rename from OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/ClassRecord.cs rename to OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/ClassRecord.cs diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Heap.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Heap.cs similarity index 100% rename from OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Heap.cs rename to OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Heap.cs diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Interpreter.Logic.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.Logic.cs similarity index 100% rename from OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Interpreter.Logic.cs rename to OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.Logic.cs diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Interpreter.Methods.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.Methods.cs similarity index 100% rename from OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Interpreter.Methods.cs rename to OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.Methods.cs diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Interpreter.Return.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.Return.cs similarity index 100% rename from OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Interpreter.Return.cs rename to OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.Return.cs diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Interpreter.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.cs similarity index 100% rename from OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Interpreter.cs rename to OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Interpreter.cs diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/MainMemory.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/MainMemory.cs similarity index 100% rename from OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/MainMemory.cs rename to OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/MainMemory.cs diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/MethodMemory.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/MethodMemory.cs similarity index 100% rename from OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/MethodMemory.cs rename to OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/MethodMemory.cs diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Object.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Object.cs similarity index 100% rename from OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Object.cs rename to OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Object.cs diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Stack.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Stack.cs similarity index 100% rename from OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Stack.cs rename to OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Stack.cs diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/StackFrame.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/StackFrame.cs similarity index 100% rename from OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/StackFrame.cs rename to OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/StackFrame.cs diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Thread.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Thread.cs similarity index 100% rename from OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/Thread.cs rename to OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/JVM/Thread.cs diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs index 0ae6e62822..15942a96be 100644 --- a/OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs +++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs @@ -148,7 +148,7 @@ namespace OpenSim.Region.Environment.Scripting [Obsolete("Unimplemented")] public float osCloud(Vector offset) { - return 0.0; + return 0.0f; } [Obsolete("Unimplemented")] @@ -171,7 +171,7 @@ namespace OpenSim.Region.Environment.Scripting [Obsolete("Unimplemented")] public void osCreateLink(Key target, int parent) { - return false; + return; } [Obsolete("Partially Unimplemented")]