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-03-04 10:12:39 +00:00
parent c78eebfdfc
commit d2806090ae
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/ClientManager.cs
View File

@ -193,7 +193,6 @@ namespace OpenSim.Framework
packet.Header.Reliable = false; packet.Header.Reliable = false;
LocalClients[i].OutPacket(packet, ThrottleOutPacketType.Task); LocalClients[i].OutPacket(packet, ThrottleOutPacketType.Task);
} }
} }
} }

5
OpenSim/Grid/GridServer/GridManager.cs
View File

@ -522,7 +522,7 @@ namespace OpenSim.Grid.GridServer
//RegionProfileData TheSim = null; //RegionProfileData TheSim = null;
string uuid = String.Empty;; string uuid = String.Empty;;
Hashtable requestData = (Hashtable) request.Params[0]; Hashtable requestData = (Hashtable) request.Params[0];
string myword;
if (requestData.ContainsKey("UUID")) { if (requestData.ContainsKey("UUID")) {
//TheSim = getRegion(new LLUUID((string) requestData["UUID"])); //TheSim = getRegion(new LLUUID((string) requestData["UUID"]));
uuid = requestData["UUID"].ToString(); uuid = requestData["UUID"].ToString();
@ -559,7 +559,8 @@ namespace OpenSim.Grid.GridServer
break; break;
} }
} }
catch (Exception e) { catch (Exception)
{
m_log.Error("storage Unable to delete region " + uuid + " via MySQL"); m_log.Error("storage Unable to delete region " + uuid + " via MySQL");
//MainLog.Instance.Warn("storage", e.ToString()); //MainLog.Instance.Warn("storage", e.ToString());
} }

16
ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs vendored
View File

@ -738,11 +738,11 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
IClientAPI controller = null; IClientAPI controller = null;
foreach (uint code in circuits) foreach (uint code in circuits)
{ {
m_log.InfoFormat("[BALANCER] "+"circuit code : {0}", code); m_log.InfoFormat("[BALANCER] "+"circuit code : {0}", code);
if (scene.ClientManager.TryGetClient(code, out controller)) if (scene.ClientManager.TryGetClient(code, out controller))
{ {
// Divide the presences evenly over the set of subscenes // Divide the presences evenly over the set of subscenes
ClientView client = (ClientView) controller; ClientView client = (ClientView) controller;
client.PacketProcessingEnabled = (( (i + myID) % sceneURL.Length) == 0); client.PacketProcessingEnabled = (( (i + myID) % sceneURL.Length) == 0);
@ -750,15 +750,15 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
m_log.InfoFormat("[SPLITSCENE] === SplitRegion {0}: SP.PacketEnabled {1}", region.RegionID, client.PacketProcessingEnabled); m_log.InfoFormat("[SPLITSCENE] === SplitRegion {0}: SP.PacketEnabled {1}", region.RegionID, client.PacketProcessingEnabled);
if (!client.PacketProcessingEnabled) if (!client.PacketProcessingEnabled)
{ {
// stopping clientview thread // stopping clientview thread
client.Stop(); client.Stop();
} }
++i;
}
}
++i;
}
}
scene.splitID = myID; scene.splitID = myID;
scene.SynchronizeScene = new Scene.SynchronizeSceneHandler(SynchronizeScenes); scene.SynchronizeScene = new Scene.SynchronizeSceneHandler(SynchronizeScenes);
isSplit = true; isSplit = true;

2
ThirdParty/3Di/LoadBalancer/TcpServer.cs vendored
View File

@ -175,7 +175,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer {
} // while (true) } // while (true)
} }
catch (Exception e) catch (Exception)
{ {
//MainLog.Instance.Verbose("TCPSERVER", e.ToString()); //MainLog.Instance.Verbose("TCPSERVER", e.ToString());
//MainLog.Instance.Verbose("TCPSERVER", e.StackTrace); //MainLog.Instance.Verbose("TCPSERVER", e.StackTrace);