OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleaned up a couple compiler warnings.

0.6.0-stable
Jeff Ames 2008-02-29 10:35:03 +00:00
parent fa7322eac9
commit de80a23c1a
2 changed files with 29 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/ClientStack/UDPServer.cs
View File

@ -127,7 +127,6 @@ namespace OpenSim.Region.ClientStack
case SocketError.AlreadyInProgress: case SocketError.AlreadyInProgress:
case SocketError.NetworkReset: case SocketError.NetworkReset:
case SocketError.ConnectionReset: case SocketError.ConnectionReset:
try try
{ {
CloseEndPoint(epSender); CloseEndPoint(epSender);
@ -217,7 +216,6 @@ namespace OpenSim.Region.ClientStack
try try
{ {
packet = PacketPool.Instance.GetPacket(RecvBuffer, ref packetEnd, ZeroBuffer); packet = PacketPool.Instance.GetPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
} }
catch (Exception e) catch (Exception e)
{ {
@ -228,7 +226,7 @@ namespace OpenSim.Region.ClientStack
{ {
Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
} }
catch (SocketException e4) catch (SocketException)
{ {
try try
{ {
@ -254,7 +252,6 @@ namespace OpenSim.Region.ClientStack
{ {
m_log.Error("[UDPSERVER]: " + e5.ToString()); m_log.Error("[UDPSERVER]: " + e5.ToString());
} }
} }
if (packet != null) if (packet != null)
@ -286,10 +283,9 @@ namespace OpenSim.Region.ClientStack
// invalid client // invalid client
//CFK: This message seems to have served its usefullness as of 12-15 so I am commenting it out for now //CFK: This message seems to have served its usefullness as of 12-15 so I am commenting it out for now
//m_log.Warn("[UDPSERVER]: Got a packet from an invalid client - " + packet.ToString()); //m_log.Warn("[UDPSERVER]: Got a packet from an invalid client - " + packet.ToString());
} }
} }
catch (Exception ex) catch (Exception)
{ {
m_log.Error("[UDPSERVER]: Exception in processing packet."); m_log.Error("[UDPSERVER]: Exception in processing packet.");
m_log.Debug("[UDPSERVER]: Adding New Client"); m_log.Debug("[UDPSERVER]: Adding New Client");
@ -407,7 +403,6 @@ namespace OpenSim.Region.ClientStack
{ {
clientCircuits.Remove(sendto); clientCircuits.Remove(sendto);
clientCircuits_reverse.Remove(circuitcode); clientCircuits_reverse.Remove(circuitcode);
} }
} }

68
OpenSim/Region/Environment/Modules/ChatModule.cs
View File

@ -75,6 +75,7 @@ namespace OpenSim.Region.Environment.Modules
catch (Exception) catch (Exception)
{ {
} }
try try
{ {
m_defaultzone = config.Configs["IRC"].GetString("nick","Sim"); m_defaultzone = config.Configs["IRC"].GetString("nick","Sim");
@ -97,7 +98,6 @@ namespace OpenSim.Region.Environment.Modules
m_irc_connector.Name = "IRCConnectorThread"; m_irc_connector.Name = "IRCConnectorThread";
m_irc_connector.IsBackground = true; m_irc_connector.IsBackground = true;
} }
} }
} }
@ -118,10 +118,9 @@ namespace OpenSim.Region.Environment.Modules
OpenSim.Framework.ThreadTracker.Add(m_irc_connector); OpenSim.Framework.ThreadTracker.Add(m_irc_connector);
} }
} }
catch (Exception ex) catch (Exception)
{ {
} }
} }
} }
@ -195,8 +194,8 @@ namespace OpenSim.Region.Environment.Modules
m_log.Error("[IRC]: ClientLoggedOut exception trap:" + ex.ToString()); m_log.Error("[IRC]: ClientLoggedOut exception trap:" + ex.ToString());
} }
} }
} }
private void TrySendChatMessage(ScenePresence presence, LLVector3 fromPos, LLVector3 regionPos, private void TrySendChatMessage(ScenePresence presence, LLVector3 fromPos, LLVector3 regionPos,
LLUUID fromAgentID, string fromName, ChatTypeEnum type, string message) LLUUID fromAgentID, string fromName, ChatTypeEnum type, string message)
{ {
@ -253,7 +252,7 @@ namespace OpenSim.Region.Environment.Modules
} }
// Try to reconnect to server if not connected // Try to reconnect to server if not connected
if ((m_irc.Enabled)&&(!m_irc.Connected)) if (m_irc.Enabled && !m_irc.Connected)
{ {
// In a non-blocking way. Eventually the connector will get it started // In a non-blocking way. Eventually the connector will get it started
try try
@ -267,7 +266,7 @@ namespace OpenSim.Region.Environment.Modules
OpenSim.Framework.ThreadTracker.Add(m_irc_connector); OpenSim.Framework.ThreadTracker.Add(m_irc_connector);
} }
} }
catch (Exception ex) catch (Exception)
{ {
} }
} }
@ -285,10 +284,10 @@ namespace OpenSim.Region.Environment.Modules
foreach (Scene s in m_scenes) foreach (Scene s in m_scenes)
{ {
s.ForEachScenePresence(delegate(ScenePresence presence) s.ForEachScenePresence(delegate(ScenePresence presence)
{ {
TrySendChatMessage(presence, fromPos, regionPos, TrySendChatMessage(presence, fromPos, regionPos,
fromAgentID, fromName, e.Type, message); fromAgentID, fromName, e.Type, message);
}); });
} }
} }
} }
@ -312,18 +311,18 @@ namespace OpenSim.Region.Environment.Modules
string sourceRegion = null; string sourceRegion = null;
foreach (Scene s in m_scenes) foreach (Scene s in m_scenes)
{ {
s.ForEachScenePresence(delegate(ScenePresence presence) s.ForEachScenePresence(delegate(ScenePresence presence)
{ {
if ((presence.IsChildAgent==false) if ((presence.IsChildAgent==false)
&&(presence.Firstname==client_FirstName) &&(presence.Firstname==client_FirstName)
&&(presence.Lastname==client_LastName)) &&(presence.Lastname==client_LastName))
{ {
sourceRegion = presence.Scene.RegionInfo.RegionName; sourceRegion = presence.Scene.RegionInfo.RegionName;
//sourceRegion= s.RegionInfo.RegionName; //sourceRegion= s.RegionInfo.RegionName;
} }
}); });
if (sourceRegion != null) return sourceRegion; if (sourceRegion != null) return sourceRegion;
} }
if (m_defaultzone == null) { m_defaultzone = "Sim"; } if (m_defaultzone == null) { m_defaultzone = "Sim"; }
return m_defaultzone; return m_defaultzone;
} }
@ -475,7 +474,6 @@ namespace OpenSim.Region.Environment.Modules
m_reader.Close(); m_reader.Close();
m_tcp.Close(); m_tcp.Close();
if (m_enabled) { Connect(m_last_scenes); } if (m_enabled) { Connect(m_last_scenes); }
} }
public void PrivMsg(string from, string region, string msg) public void PrivMsg(string from, string region, string msg)
@ -539,9 +537,9 @@ namespace OpenSim.Region.Environment.Modules
public void PingRun() public void PingRun()
{ {
// IRC keep alive thread // IRC keep alive thread
// send PING ever 15 seconds // send PING ever 15 seconds
while (true) while (true)
{ {
try try
{ {
@ -594,8 +592,6 @@ namespace OpenSim.Region.Environment.Modules
} }
}); });
} }
} }
else else
{ {
@ -645,7 +641,6 @@ namespace OpenSim.Region.Environment.Modules
catch (Exception ex) // IRC gate should not crash Sim catch (Exception ex) // IRC gate should not crash Sim
{ {
m_log.Error("[IRC]: BroadcastSim Exception Trap:" + ex.ToString() + "\n" + ex.StackTrace); m_log.Error("[IRC]: BroadcastSim Exception Trap:" + ex.ToString() + "\n" + ex.StackTrace);
} }
} }
@ -701,7 +696,6 @@ namespace OpenSim.Region.Environment.Modules
m_writer.WriteLine("PONG " + p_reply); m_writer.WriteLine("PONG " + p_reply);
m_writer.Flush(); m_writer.Flush();
} }
else if (commArgs[0] == c_server) else if (commArgs[0] == c_server)
{ {
@ -727,10 +721,9 @@ namespace OpenSim.Region.Environment.Modules
break; break;
} }
} }
catch (Exception ex) catch (Exception)
{ {
} }
} }
else else
{ {
@ -746,8 +739,6 @@ namespace OpenSim.Region.Environment.Modules
case "QUIT": eventIrcQuit(commArgs); break; case "QUIT": eventIrcQuit(commArgs); break;
case "PONG": break; // that's nice case "PONG": break; // that's nice
} }
} }
} }
@ -756,7 +747,6 @@ namespace OpenSim.Region.Environment.Modules
string IrcChannel = commArgs[2]; string IrcChannel = commArgs[2];
string IrcUser = commArgs[0].Split('!')[0]; string IrcUser = commArgs[0].Split('!')[0];
BroadcastSim(IrcUser + " is joining " + IrcChannel, m_nick); BroadcastSim(IrcUser + " is joining " + IrcChannel, m_nick);
} }
public void eventIrcPart(string[] commArgs) public void eventIrcPart(string[] commArgs)
@ -764,8 +754,8 @@ namespace OpenSim.Region.Environment.Modules
string IrcChannel = commArgs[2]; string IrcChannel = commArgs[2];
string IrcUser = commArgs[0].Split('!')[0]; string IrcUser = commArgs[0].Split('!')[0];
BroadcastSim(IrcUser + " is parting " + IrcChannel, m_nick); BroadcastSim(IrcUser + " is parting " + IrcChannel, m_nick);
} }
public void eventIrcMode(string[] commArgs) public void eventIrcMode(string[] commArgs)
{ {
string IrcChannel = commArgs[2]; string IrcChannel = commArgs[2];
@ -780,14 +770,13 @@ namespace OpenSim.Region.Environment.Modules
{ {
UserMode = UserMode.Remove(0, 1); UserMode = UserMode.Remove(0, 1);
} }
} }
public void eventIrcNickChange(string[] commArgs) public void eventIrcNickChange(string[] commArgs)
{ {
string UserOldNick = commArgs[0].Split('!')[0]; string UserOldNick = commArgs[0].Split('!')[0];
string UserNewNick = commArgs[2].Remove(0, 1); string UserNewNick = commArgs[2].Remove(0, 1);
BroadcastSim(UserOldNick + " changed their nick to " + UserNewNick, m_nick); BroadcastSim(UserOldNick + " changed their nick to " + UserNewNick, m_nick);
} }
public void eventIrcKick(string[] commArgs) public void eventIrcKick(string[] commArgs)
@ -804,7 +793,6 @@ namespace OpenSim.Region.Environment.Modules
if (UserKicked == m_nick) if (UserKicked == m_nick)
{ {
BroadcastSim("Hey, that was me!!!", m_nick); BroadcastSim("Hey, that was me!!!", m_nick);
} }
} }
@ -818,10 +806,8 @@ namespace OpenSim.Region.Environment.Modules
QuitMessage += commArgs[i] + " "; QuitMessage += commArgs[i] + " ";
} }
BroadcastSim(IrcUser + " quits saying " + QuitMessage, m_nick); BroadcastSim(IrcUser + " quits saying " + QuitMessage, m_nick);
} }
public void Close() public void Close()
{ {
m_connected = false; m_connected = false;