diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs index ac91b78744..b38665d333 100644 --- a/OpenSim/Region/Environment/Modules/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/ChatModule.cs @@ -20,24 +20,27 @@ namespace OpenSim.Region.Environment.Modules private string m_server = "irc2.choopa.net"; - private int m_port = 6668; - private string m_user = "USER OpenSimBot 8 * :I'm a OpenSim to irc bot"; + // private int m_port = 6668; + //private string m_user = "USER OpenSimBot 8 * :I'm a OpenSim to irc bot"; private string m_nick = "OSimBot"; private string m_channel = "#opensim"; - private NetworkStream m_stream; - private TcpClient m_irc; + // private NetworkStream m_stream; + private TcpClient m_irc; private StreamWriter m_ircWriter; - private StreamReader m_ircReader; + private StreamReader m_ircReader; - private Thread pingSender; - private Thread listener; + // private Thread pingSender; + // private Thread listener; private bool connected = false; public ChatModule() { m_nick = "OSimBot" + Util.RandomClass.Next(1, 99); + m_irc = null; + m_ircWriter = null; + m_ircReader = null; } public void Initialise(Scene scene) diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 7b7c595eeb..1f8e5bb85a 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment.Scenes public delegate void SignificantClientMovement(IClientAPI remote_client); public event SignificantClientMovement OnSignificantClientMovement; - public List InterestList = new List(); + //public List InterestList = new List(); // private Queue m_fullGroupUpdates = new Queue(); // private Queue m_terseGroupUpdates = new Queue(); @@ -198,6 +198,11 @@ namespace OpenSim.Region.Environment.Scenes //temporary until we move some code into the body classes this.m_body = new ChildAgent(); + if (newAvatar) + { + //do we need to use newAvatar? not sure so have added this to kill the compile warning + } + } #endregion diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs index 4f65b131b6..31641af3ed 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs @@ -108,7 +108,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine EventQueueThread.Abort(); EventQueueThread.Join(); } - catch (Exception e) + catch (Exception) { //myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Exception killing worker thread: " + e.ToString()); } @@ -220,7 +220,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine } } // while } // try - catch (ThreadAbortException tae) + catch (ThreadAbortException) { //myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Worker thread killed: " + tae.Message); } diff --git a/prebuild.xml b/prebuild.xml index 2d475c7326..c79f963898 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -800,7 +800,6 @@ -