aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/SimClient.cs
diff options
context:
space:
mode:
authorAdam Frisby2007-05-12 15:32:04 +0000
committerAdam Frisby2007-05-12 15:32:04 +0000
commitbd05850be1ce0dcf45c37b5e7b7c53ace2682b2b (patch)
treef4b4af88ceba3f9cb2d861fadae901280c40147f /OpenSim.RegionServer/SimClient.cs
parentOnly 193 warnings to go! (diff)
downloadopensim-SC_OLD-bd05850be1ce0dcf45c37b5e7b7c53ace2682b2b.zip
opensim-SC_OLD-bd05850be1ce0dcf45c37b5e7b7c53ace2682b2b.tar.gz
opensim-SC_OLD-bd05850be1ce0dcf45c37b5e7b7c53ace2682b2b.tar.bz2
opensim-SC_OLD-bd05850be1ce0dcf45c37b5e7b7c53ace2682b2b.tar.xz
93 warnings in the compiler, 93 warnings appear, you fix one up, create two more, 94 warnings in the compiler...
Diffstat (limited to 'OpenSim.RegionServer/SimClient.cs')
-rw-r--r--OpenSim.RegionServer/SimClient.cs28
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index 856909c..76bf46e 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -110,7 +110,7 @@ namespace OpenSim
110 m_child = child; 110 m_child = child;
111 m_regionData = regionDat; 111 m_regionData = regionDat;
112 112
113 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs - Started up new client thread to handle incoming request"); 113 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"OpenSimClient.cs - Started up new client thread to handle incoming request");
114 cirpack = initialcirpack; 114 cirpack = initialcirpack;
115 userEP = remoteEP; 115 userEP = remoteEP;
116 if (m_gridServer.GetName() == "Remote") 116 if (m_gridServer.GetName() == "Remote")
@@ -169,7 +169,7 @@ namespace OpenSim
169 neighbourx += 1; 169 neighbourx += 1;
170 newpos.Y = 1; 170 newpos.Y = 1;
171 } 171 }
172 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimClient.cs:CrossSimBorder() - Crossing border to neighbouring sim at [" + neighbourx.ToString() + "," + neighboury.ToString() + "]"); 172 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"SimClient.cs:CrossSimBorder() - Crossing border to neighbouring sim at [" + neighbourx.ToString() + "," + neighboury.ToString() + "]");
173 173
174 Hashtable SimParams; 174 Hashtable SimParams;
175 ArrayList SendParams; 175 ArrayList SendParams;
@@ -220,7 +220,7 @@ namespace OpenSim
220 220
221 public void UpgradeClient() 221 public void UpgradeClient()
222 { 222 {
223 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimClient.cs:UpgradeClient() - upgrading child to full agent"); 223 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"SimClient.cs:UpgradeClient() - upgrading child to full agent");
224 this.m_child = false; 224 this.m_child = false;
225 this.m_world.RemoveViewerAgent(this); 225 this.m_world.RemoveViewerAgent(this);
226 if (!this.m_sandboxMode) 226 if (!this.m_sandboxMode)
@@ -233,7 +233,7 @@ namespace OpenSim
233 233
234 public void DowngradeClient() 234 public void DowngradeClient()
235 { 235 {
236 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimClient.cs:UpgradeClient() - changing full agent to child"); 236 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"SimClient.cs:UpgradeClient() - changing full agent to child");
237 this.m_child = true; 237 this.m_child = true;
238 this.m_world.RemoveViewerAgent(this); 238 this.m_world.RemoveViewerAgent(this);
239 this.m_world.AddViewerAgent(this); 239 this.m_world.AddViewerAgent(this);
@@ -398,7 +398,7 @@ namespace OpenSim
398 m_world.AddNewPrim((ObjectAddPacket)Pack, this); 398 m_world.AddNewPrim((ObjectAddPacket)Pack, this);
399 break; 399 break;
400 case PacketType.ObjectLink: 400 case PacketType.ObjectLink:
401 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(Pack.ToString()); 401 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,Pack.ToString());
402 ObjectLinkPacket link = (ObjectLinkPacket)Pack; 402 ObjectLinkPacket link = (ObjectLinkPacket)Pack;
403 uint parentprimid = 0; 403 uint parentprimid = 0;
404 OpenSim.world.Primitive parentprim = null; 404 OpenSim.world.Primitive parentprim = null;
@@ -426,7 +426,7 @@ namespace OpenSim
426 } 426 }
427 break; 427 break;
428 case PacketType.ObjectScale: 428 case PacketType.ObjectScale:
429 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(Pack.ToString()); 429 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,Pack.ToString());
430 break; 430 break;
431 case PacketType.ObjectShape: 431 case PacketType.ObjectShape:
432 ObjectShapePacket shape = (ObjectShapePacket)Pack; 432 ObjectShapePacket shape = (ObjectShapePacket)Pack;
@@ -657,7 +657,7 @@ namespace OpenSim
657 { 657 {
658 if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent)) 658 if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))
659 { 659 {
660 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Resending " + packet.Type.ToString() + " packet, " + 660 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Resending " + packet.Type.ToString() + " packet, " +
661 (now - packet.TickCount) + "ms have passed"); 661 (now - packet.TickCount) + "ms have passed");
662 662
663 packet.Header.Resent = true; 663 packet.Header.Resent = true;
@@ -676,7 +676,7 @@ namespace OpenSim
676 if (PendingAcks.Count > 250) 676 if (PendingAcks.Count > 250)
677 { 677 {
678 // FIXME: Handle the odd case where we have too many pending ACKs queued up 678 // FIXME: Handle the odd case where we have too many pending ACKs queued up
679 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Too many ACKs queued up!"); 679 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Too many ACKs queued up!");
680 return; 680 return;
681 } 681 }
682 682
@@ -799,7 +799,7 @@ namespace OpenSim
799 } 799 }
800 catch (Exception) 800 catch (Exception)
801 { 801 {
802 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread"); 802 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");
803 ClientThread.Abort(); 803 ClientThread.Abort();
804 } 804 }
805 805
@@ -860,7 +860,7 @@ namespace OpenSim
860 860
861 protected virtual void ClientLoop() 861 protected virtual void ClientLoop()
862 { 862 {
863 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs:ClientLoop() - Entered loop"); 863 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"OpenSimClient.cs:ClientLoop() - Entered loop");
864 while (true) 864 while (true)
865 { 865 {
866 QueItem nextPacket = PacketQueue.Dequeue(); 866 QueItem nextPacket = PacketQueue.Dequeue();
@@ -879,7 +879,7 @@ namespace OpenSim
879 879
880 protected virtual void InitNewClient() 880 protected virtual void InitNewClient()
881 { 881 {
882 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs:InitNewClient() - Adding viewer agent to world"); 882 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
883 883
884 m_world.AddViewerAgent(this); 884 m_world.AddViewerAgent(this);
885 world.Entity tempent = m_world.Entities[this.AgentID]; 885 world.Entity tempent = m_world.Entities[this.AgentID];
@@ -893,12 +893,12 @@ namespace OpenSim
893 if (!sessionInfo.Authorised) 893 if (!sessionInfo.Authorised)
894 { 894 {
895 //session/circuit not authorised 895 //session/circuit not authorised
896 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString()); 896 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL,"OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
897 ClientThread.Abort(); 897 ClientThread.Abort();
898 } 898 }
899 else 899 else
900 { 900 {
901 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString()); 901 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL,"OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
902 //session is authorised 902 //session is authorised
903 this.AgentID = cirpack.CircuitCode.ID; 903 this.AgentID = cirpack.CircuitCode.ID;
904 this.SessionID = cirpack.CircuitCode.SessionID; 904 this.SessionID = cirpack.CircuitCode.SessionID;
@@ -947,7 +947,7 @@ namespace OpenSim
947 947
948 protected virtual bool Logout(SimClient simClient, Packet packet) 948 protected virtual bool Logout(SimClient simClient, Packet packet)
949 { 949 {
950 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got a logout request"); 950 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"OpenSimClient.cs:ProcessInPacket() - Got a logout request");
951 //send reply to let the client logout 951 //send reply to let the client logout
952 LogoutReplyPacket logReply = new LogoutReplyPacket(); 952 LogoutReplyPacket logReply = new LogoutReplyPacket();
953 logReply.AgentData.AgentID = this.AgentID; 953 logReply.AgentData.AgentID = this.AgentID;