From 0f1b2f278b9a11dacc14949cd78437c395d2f57c Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Fri, 13 Jul 2007 07:17:42 +0000
Subject: * Fixing compiler warnings in an attempt to reduce them back down to
zero.
---
OpenSim/Framework/General/RegionCommsListener.cs | 35 ++++++++++++++++++++++
OpenSim/Region/Environment/Scenes/SceneObject.cs | 2 +-
.../scripting/Engines/JVMEngine/OpenSimJVM.cs | 1 -
.../LocalStorageSQLite/Properties/AssemblyInfo.cs | 4 +--
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;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
+using System.Collections.Generic;
+
namespace OpenSim.Framework
{
public class RegionCommsListener :IRegionCommsListener
@@ -64,5 +66,38 @@ namespace OpenSim.Framework
}
return false;
}
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <remarks>TODO: Doesnt take any args??</remarks>
+ /// <returns></returns>
+ public virtual bool TriggerExpectChildAgent()
+ {
+ if (OnExpectChildAgent != null)
+ {
+ OnExpectChildAgent();
+ return true;
+ }
+
+ return false;
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <remarks>Added to avoid a unused compiler warning on OnNeighboursUpdate, TODO: Check me</remarks>
+ /// <param name="neighbours"></param>
+ /// <returns></returns>
+ public virtual bool TriggerOnNeighboursUpdate(List<RegionInfo> neighbours)
+ {
+ if (OnNeighboursUpdate != null)
+ {
+ OnNeighboursUpdate(neighbours);
+ return true;
+ }
+
+ return false;
+ }
}
}
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
///
/// </summary>
/// <returns>A complete copy of the object</returns>
- public SceneObject Copy()
+ public new SceneObject Copy()
{
SceneObject dupe = new SceneObject();
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
private List<Thread> _threads = new List<Thread>();
private BlockingQueue<CompileInfo> CompileScripts = new BlockingQueue<CompileInfo>();
private MainMemory _mainMemory;
- private System.Threading.Thread compileThread;
ScriptInfo scriptInfo;
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;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.*")]
-[assembly: AssemblyFileVersion("1.0.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
--
cgit v1.1