From 038774de30ce26120c91ccd8e1cda1b2a89e1841 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Sun, 29 Jul 2007 09:37:29 +0000 Subject: Commit 1/2 * DB4o no longer crashes the sim on Startup * DB4o now crashes the sim on shutdown. * Variety of console verbosity fixes. --- OpenSim/Region/ClientStack/RegionApplicationBase.cs | 4 ++-- OpenSim/Region/ClientStack/UDPServer.cs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/ClientStack') diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index a61b9e3..bad7fec 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs @@ -120,13 +120,13 @@ namespace OpenSim.Region.ClientStack UserProfileData masterAvatar = m_commsManager.UserServer.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName, scene.RegionInfo.MasterAvatarSandboxPassword); if (masterAvatar != null) { - m_log.Notice("Parcels - Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]"); + m_log.Verbose("PARCEL", "Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]"); scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID; //TODO: Load parcels from storageManager } else { - m_log.Notice("Parcels - No master avatar found, using null."); + m_log.Verbose("PARCEL", "No master avatar found, using null."); scene.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero; //TODO: Load parcels from storageManager } diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs index 705ced0..1e1801f 100644 --- a/OpenSim/Region/ClientStack/UDPServer.cs +++ b/OpenSim/Region/ClientStack/UDPServer.cs @@ -122,7 +122,7 @@ namespace OpenSim.Region.ClientStack } else { // invalid client - m_log.Warn("client", "UDPServer.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString()); + m_log.Warn("client", "Got a packet from an invalid client - " + epSender.ToString()); } Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); @@ -138,20 +138,20 @@ namespace OpenSim.Region.ClientStack public void ServerListener() { - m_log.Status("SERVER", "UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort); + m_log.Verbose("SERVER", "Opening UDP socket on " + listenPort); ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort); Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); Server.Bind(ServerIncoming); - m_log.Verbose("SERVER", "UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen"); + m_log.Verbose("SERVER", "UDP socket bound, getting ready to listen"); ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); epSender = (EndPoint)ipeSender; ReceivedData = new AsyncCallback(this.OnReceivedData); Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); - m_log.Verbose("SERVER", "UDPServer.cs:ServerListener() - Listening..."); + m_log.Status("SERVER", "Listening..."); } -- cgit v1.1