diff options
Cut down on the number of compile warnings. Now down to 5: 4 are related to unused events on IClientAPI and 1 is a unused variable in LSL_BuiltIn_Commands (which I'll leave to Tedd, as he will know if it will be used in the future or not).
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/ChatModule.cs | 17 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs | 4 |
3 files changed, 18 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs index ac91b78..b38665d 100644 --- a/OpenSim/Region/Environment/Modules/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/ChatModule.cs | |||
@@ -20,24 +20,27 @@ namespace OpenSim.Region.Environment.Modules | |||
20 | 20 | ||
21 | private string m_server = "irc2.choopa.net"; | 21 | private string m_server = "irc2.choopa.net"; |
22 | 22 | ||
23 | private int m_port = 6668; | 23 | // private int m_port = 6668; |
24 | private string m_user = "USER OpenSimBot 8 * :I'm a OpenSim to irc bot"; | 24 | //private string m_user = "USER OpenSimBot 8 * :I'm a OpenSim to irc bot"; |
25 | private string m_nick = "OSimBot"; | 25 | private string m_nick = "OSimBot"; |
26 | private string m_channel = "#opensim"; | 26 | private string m_channel = "#opensim"; |
27 | 27 | ||
28 | private NetworkStream m_stream; | 28 | // private NetworkStream m_stream; |
29 | private TcpClient m_irc; | 29 | private TcpClient m_irc; |
30 | private StreamWriter m_ircWriter; | 30 | private StreamWriter m_ircWriter; |
31 | private StreamReader m_ircReader; | 31 | private StreamReader m_ircReader; |
32 | 32 | ||
33 | private Thread pingSender; | 33 | // private Thread pingSender; |
34 | private Thread listener; | 34 | // private Thread listener; |
35 | 35 | ||
36 | private bool connected = false; | 36 | private bool connected = false; |
37 | 37 | ||
38 | public ChatModule() | 38 | public ChatModule() |
39 | { | 39 | { |
40 | m_nick = "OSimBot" + Util.RandomClass.Next(1, 99); | 40 | m_nick = "OSimBot" + Util.RandomClass.Next(1, 99); |
41 | m_irc = null; | ||
42 | m_ircWriter = null; | ||
43 | m_ircReader = null; | ||
41 | } | 44 | } |
42 | 45 | ||
43 | public void Initialise(Scene scene) | 46 | public void Initialise(Scene scene) |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 7b7c595..1f8e5bb 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
88 | public delegate void SignificantClientMovement(IClientAPI remote_client); | 88 | public delegate void SignificantClientMovement(IClientAPI remote_client); |
89 | public event SignificantClientMovement OnSignificantClientMovement; | 89 | public event SignificantClientMovement OnSignificantClientMovement; |
90 | 90 | ||
91 | public List<SceneObjectGroup> InterestList = new List<SceneObjectGroup>(); | 91 | //public List<SceneObjectGroup> InterestList = new List<SceneObjectGroup>(); |
92 | 92 | ||
93 | // private Queue<SceneObjectGroup> m_fullGroupUpdates = new Queue<SceneObjectGroup>(); | 93 | // private Queue<SceneObjectGroup> m_fullGroupUpdates = new Queue<SceneObjectGroup>(); |
94 | // private Queue<SceneObjectGroup> m_terseGroupUpdates = new Queue<SceneObjectGroup>(); | 94 | // private Queue<SceneObjectGroup> m_terseGroupUpdates = new Queue<SceneObjectGroup>(); |
@@ -198,6 +198,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
198 | //temporary until we move some code into the body classes | 198 | //temporary until we move some code into the body classes |
199 | this.m_body = new ChildAgent(); | 199 | this.m_body = new ChildAgent(); |
200 | 200 | ||
201 | if (newAvatar) | ||
202 | { | ||
203 | //do we need to use newAvatar? not sure so have added this to kill the compile warning | ||
204 | } | ||
205 | |||
201 | } | 206 | } |
202 | #endregion | 207 | #endregion |
203 | 208 | ||
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs index 4f65b13..31641af 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs | |||
@@ -108,7 +108,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
108 | EventQueueThread.Abort(); | 108 | EventQueueThread.Abort(); |
109 | EventQueueThread.Join(); | 109 | EventQueueThread.Join(); |
110 | } | 110 | } |
111 | catch (Exception e) | 111 | catch (Exception) |
112 | { | 112 | { |
113 | //myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Exception killing worker thread: " + e.ToString()); | 113 | //myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Exception killing worker thread: " + e.ToString()); |
114 | } | 114 | } |
@@ -220,7 +220,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
220 | } | 220 | } |
221 | } // while | 221 | } // while |
222 | } // try | 222 | } // try |
223 | catch (ThreadAbortException tae) | 223 | catch (ThreadAbortException) |
224 | { | 224 | { |
225 | //myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Worker thread killed: " + tae.Message); | 225 | //myScriptEngine.Log.Verbose("ScriptEngine", "EventQueueManager Worker thread killed: " + tae.Message); |
226 | } | 226 | } |