diff options
Diffstat (limited to 'OpenSim/Region')
3 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs index ecd2dee..93b6e8d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObject.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs | |||
@@ -110,7 +110,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
110 | /// | 110 | /// |
111 | /// </summary> | 111 | /// </summary> |
112 | /// <returns>A complete copy of the object</returns> | 112 | /// <returns>A complete copy of the object</returns> |
113 | public SceneObject Copy() | 113 | public new SceneObject Copy() |
114 | { | 114 | { |
115 | SceneObject dupe = new SceneObject(); | 115 | SceneObject dupe = new SceneObject(); |
116 | 116 | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/OpenSimJVM.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/OpenSimJVM.cs index 3e083cc..c191915 100644 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/OpenSimJVM.cs +++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/OpenSimJVM.cs | |||
@@ -43,7 +43,6 @@ namespace OpenSim.Scripting.EmbeddedJVM | |||
43 | private List<Thread> _threads = new List<Thread>(); | 43 | private List<Thread> _threads = new List<Thread>(); |
44 | private BlockingQueue<CompileInfo> CompileScripts = new BlockingQueue<CompileInfo>(); | 44 | private BlockingQueue<CompileInfo> CompileScripts = new BlockingQueue<CompileInfo>(); |
45 | private MainMemory _mainMemory; | 45 | private MainMemory _mainMemory; |
46 | private System.Threading.Thread compileThread; | ||
47 | 46 | ||
48 | ScriptInfo scriptInfo; | 47 | ScriptInfo scriptInfo; |
49 | 48 | ||
diff --git a/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs index ea9cda8..7bc1cc5 100644 --- a/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs | |||
@@ -56,5 +56,5 @@ using System.Runtime.InteropServices; | |||
56 | // | 56 | // |
57 | // You can specify all the values or you can default the Revision and Build Numbers | 57 | // You can specify all the values or you can default the Revision and Build Numbers |
58 | // by using the '*' as shown below: | 58 | // by using the '*' as shown below: |
59 | [assembly: AssemblyVersion("1.0.0.*")] | 59 | [assembly: AssemblyVersion("1.0.0.0")] |
60 | [assembly: AssemblyFileVersion("1.0.0.*")] | 60 | [assembly: AssemblyFileVersion("1.0.0.0")] |