diff options
author | Adam Frisby | 2007-07-29 09:37:29 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-29 09:37:29 +0000 |
commit | 038774de30ce26120c91ccd8e1cda1b2a89e1841 (patch) | |
tree | f7f6e0c7027737b7ad77cbb4de09b734c436e903 /OpenSim/Region/ClientStack | |
parent | * Fixed an issue with Mono/UNIX filenames and DB4o storage engine. (diff) | |
download | opensim-SC-038774de30ce26120c91ccd8e1cda1b2a89e1841.zip opensim-SC-038774de30ce26120c91ccd8e1cda1b2a89e1841.tar.gz opensim-SC-038774de30ce26120c91ccd8e1cda1b2a89e1841.tar.bz2 opensim-SC-038774de30ce26120c91ccd8e1cda1b2a89e1841.tar.xz |
Commit 1/2
* DB4o no longer crashes the sim on Startup
* DB4o now crashes the sim on shutdown.
* Variety of console verbosity fixes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/UDPServer.cs | 8 |
2 files changed, 6 insertions, 6 deletions
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 | |||
120 | UserProfileData masterAvatar = m_commsManager.UserServer.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName, scene.RegionInfo.MasterAvatarSandboxPassword); | 120 | UserProfileData masterAvatar = m_commsManager.UserServer.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName, scene.RegionInfo.MasterAvatarSandboxPassword); |
121 | if (masterAvatar != null) | 121 | if (masterAvatar != null) |
122 | { | 122 | { |
123 | m_log.Notice("Parcels - Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]"); | 123 | m_log.Verbose("PARCEL", "Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]"); |
124 | scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID; | 124 | scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID; |
125 | //TODO: Load parcels from storageManager | 125 | //TODO: Load parcels from storageManager |
126 | } | 126 | } |
127 | else | 127 | else |
128 | { | 128 | { |
129 | m_log.Notice("Parcels - No master avatar found, using null."); | 129 | m_log.Verbose("PARCEL", "No master avatar found, using null."); |
130 | scene.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero; | 130 | scene.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero; |
131 | //TODO: Load parcels from storageManager | 131 | //TODO: Load parcels from storageManager |
132 | } | 132 | } |
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 | |||
122 | } | 122 | } |
123 | else | 123 | else |
124 | { // invalid client | 124 | { // invalid client |
125 | m_log.Warn("client", "UDPServer.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString()); | 125 | m_log.Warn("client", "Got a packet from an invalid client - " + epSender.ToString()); |
126 | } | 126 | } |
127 | 127 | ||
128 | Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); | 128 | Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); |
@@ -138,20 +138,20 @@ namespace OpenSim.Region.ClientStack | |||
138 | 138 | ||
139 | public void ServerListener() | 139 | public void ServerListener() |
140 | { | 140 | { |
141 | m_log.Status("SERVER", "UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort); | 141 | m_log.Verbose("SERVER", "Opening UDP socket on " + listenPort); |
142 | 142 | ||
143 | ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort); | 143 | ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort); |
144 | Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); | 144 | Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); |
145 | Server.Bind(ServerIncoming); | 145 | Server.Bind(ServerIncoming); |
146 | 146 | ||
147 | m_log.Verbose("SERVER", "UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen"); | 147 | m_log.Verbose("SERVER", "UDP socket bound, getting ready to listen"); |
148 | 148 | ||
149 | ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); | 149 | ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); |
150 | epSender = (EndPoint)ipeSender; | 150 | epSender = (EndPoint)ipeSender; |
151 | ReceivedData = new AsyncCallback(this.OnReceivedData); | 151 | ReceivedData = new AsyncCallback(this.OnReceivedData); |
152 | Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); | 152 | Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); |
153 | 153 | ||
154 | m_log.Verbose("SERVER", "UDPServer.cs:ServerListener() - Listening..."); | 154 | m_log.Status("SERVER", "Listening..."); |
155 | 155 | ||
156 | } | 156 | } |
157 | 157 | ||