aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/General/RegionCommsListener.cs35
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObject.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/scripting/Engines/JVMEngine/OpenSimJVM.cs1
-rw-r--r--OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs4
4 files changed, 38 insertions, 4 deletions
diff --git a/OpenSim/Framework/General/RegionCommsListener.cs b/OpenSim/Framework/General/RegionCommsListener.cs
index 2b0bc62..4d6b59c 100644
--- a/OpenSim/Framework/General/RegionCommsListener.cs
+++ b/OpenSim/Framework/General/RegionCommsListener.cs
@@ -29,6 +29,8 @@ using libsecondlife;
29using OpenSim.Framework.Interfaces; 29using OpenSim.Framework.Interfaces;
30using OpenSim.Framework.Types; 30using OpenSim.Framework.Types;
31 31
32using System.Collections.Generic;
33
32namespace OpenSim.Framework 34namespace OpenSim.Framework
33{ 35{
34 public class RegionCommsListener :IRegionCommsListener 36 public class RegionCommsListener :IRegionCommsListener
@@ -64,5 +66,38 @@ namespace OpenSim.Framework
64 } 66 }
65 return false; 67 return false;
66 } 68 }
69
70 /// <summary>
71 ///
72 /// </summary>
73 /// <remarks>TODO: Doesnt take any args??</remarks>
74 /// <returns></returns>
75 public virtual bool TriggerExpectChildAgent()
76 {
77 if (OnExpectChildAgent != null)
78 {
79 OnExpectChildAgent();
80 return true;
81 }
82
83 return false;
84 }
85
86 /// <summary>
87 ///
88 /// </summary>
89 /// <remarks>Added to avoid a unused compiler warning on OnNeighboursUpdate, TODO: Check me</remarks>
90 /// <param name="neighbours"></param>
91 /// <returns></returns>
92 public virtual bool TriggerOnNeighboursUpdate(List<RegionInfo> neighbours)
93 {
94 if (OnNeighboursUpdate != null)
95 {
96 OnNeighboursUpdate(neighbours);
97 return true;
98 }
99
100 return false;
101 }
67 } 102 }
68} 103}
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")]