diff options
Diffstat (limited to 'OpenSim/Region')
6 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs index 084f7e0..c99c365 100644 --- a/OpenSim/Region/ClientStack/ClientView.API.cs +++ b/OpenSim/Region/ClientStack/ClientView.API.cs | |||
@@ -305,7 +305,7 @@ namespace OpenSim.Region.ClientStack | |||
305 | } | 305 | } |
306 | catch (Exception e) | 306 | catch (Exception e) |
307 | { | 307 | { |
308 | MainLog.Instance.Warn("ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString()); | 308 | MainLog.Instance.Warn("client", "ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString()); |
309 | } | 309 | } |
310 | } | 310 | } |
311 | 311 | ||
@@ -331,7 +331,7 @@ namespace OpenSim.Region.ClientStack | |||
331 | } | 331 | } |
332 | catch (Exception e) | 332 | catch (Exception e) |
333 | { | 333 | { |
334 | MainLog.Instance.Warn("ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString()); | 334 | MainLog.Instance.Warn("client", "ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString()); |
335 | } | 335 | } |
336 | } | 336 | } |
337 | 337 | ||
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs index 597cd7d..2cd730b 100644 --- a/OpenSim/Region/ClientStack/ClientViewBase.cs +++ b/OpenSim/Region/ClientStack/ClientViewBase.cs | |||
@@ -158,7 +158,7 @@ namespace OpenSim.Region.ClientStack | |||
158 | } | 158 | } |
159 | catch (Exception) | 159 | catch (Exception) |
160 | { | 160 | { |
161 | MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread"); | 161 | MainLog.Instance.Warn("client", "OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread"); |
162 | this.KillThread(); | 162 | this.KillThread(); |
163 | } | 163 | } |
164 | 164 | ||
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs index f90a213..2c10df9 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("UDPServer.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString()); | 125 | m_log.Warn("client", "UDPServer.cs:OnReceivedData() - WARNING: 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); |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index 5bfdccb..9a81a5f 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |||
@@ -256,7 +256,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
256 | } | 256 | } |
257 | else | 257 | else |
258 | { | 258 | { |
259 | OpenSim.Framework.Console.MainLog.Instance.Warn("Attempted to duplicate nonexistant prim"); | 259 | OpenSim.Framework.Console.MainLog.Instance.Warn("client", "Attempted to duplicate nonexistant prim"); |
260 | } | 260 | } |
261 | 261 | ||
262 | } | 262 | } |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 3e7b820..a660d82 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -248,7 +248,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
248 | } | 248 | } |
249 | catch (Exception e) | 249 | catch (Exception e) |
250 | { | 250 | { |
251 | MainLog.Instance.Warn("World.cs: Update() - Failed with exception " + e.ToString()); | 251 | MainLog.Instance.Warn("scene", "World.cs: Update() - Failed with exception " + e.ToString()); |
252 | } | 252 | } |
253 | updateLock.ReleaseMutex(); | 253 | updateLock.ReleaseMutex(); |
254 | } | 254 | } |
@@ -295,7 +295,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
295 | } | 295 | } |
296 | catch (Exception e) | 296 | catch (Exception e) |
297 | { | 297 | { |
298 | MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); | 298 | MainLog.Instance.Warn("terrain", "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); |
299 | } | 299 | } |
300 | } | 300 | } |
301 | 301 | ||
@@ -326,7 +326,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
326 | } | 326 | } |
327 | catch (Exception e) | 327 | catch (Exception e) |
328 | { | 328 | { |
329 | MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); | 329 | MainLog.Instance.Warn("terrain", "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); |
330 | } | 330 | } |
331 | } | 331 | } |
332 | 332 | ||
@@ -352,7 +352,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
352 | } | 352 | } |
353 | catch (Exception e) | 353 | catch (Exception e) |
354 | { | 354 | { |
355 | MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); | 355 | MainLog.Instance.Warn("terrain", "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); |
356 | } | 356 | } |
357 | } | 357 | } |
358 | 358 | ||
@@ -402,7 +402,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
402 | } | 402 | } |
403 | catch (Exception e) | 403 | catch (Exception e) |
404 | { | 404 | { |
405 | MainLog.Instance.Warn("World.cs: LoadWorldMap() - Failed with exception " + e.ToString()); | 405 | MainLog.Instance.Warn("terrain", "World.cs: LoadWorldMap() - Failed with exception " + e.ToString()); |
406 | } | 406 | } |
407 | } | 407 | } |
408 | 408 | ||
@@ -784,7 +784,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
784 | cap.RegisterHandlers(); | 784 | cap.RegisterHandlers(); |
785 | if (capsHandlers.ContainsKey(agent.AgentID)) | 785 | if (capsHandlers.ContainsKey(agent.AgentID)) |
786 | { | 786 | { |
787 | MainLog.Instance.Warn("Adding duplicate CAPS entry for user " + | 787 | MainLog.Instance.Warn("client", "Adding duplicate CAPS entry for user " + |
788 | agent.AgentID.ToStringHyphenated()); | 788 | agent.AgentID.ToStringHyphenated()); |
789 | capsHandlers[agent.AgentID] = cap; | 789 | capsHandlers[agent.AgentID] = cap; |
790 | } | 790 | } |
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs index 831c165..f52e9e2 100644 --- a/OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs +++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs | |||
@@ -76,14 +76,14 @@ namespace OpenSim.Region.Scripting | |||
76 | Vector myPosition = Task.Pos; | 76 | Vector myPosition = Task.Pos; |
77 | Land myParcel = World.LandManager.getLandObject(myPosition.X, myPosition.Y); | 77 | Land myParcel = World.LandManager.getLandObject(myPosition.X, myPosition.Y); |
78 | 78 | ||
79 | OpenSim.Framework.Console.MainLog.Instance.Warn("Unimplemented function called by script: osAddToLandPassList(Key avatar, float hours)"); | 79 | OpenSim.Framework.Console.MainLog.Instance.Warn("script", "Unimplemented function called by script: osAddToLandPassList(Key avatar, float hours)"); |
80 | return; | 80 | return; |
81 | } | 81 | } |
82 | 82 | ||
83 | [Obsolete("Unimplemented")] | 83 | [Obsolete("Unimplemented")] |
84 | public void osAdjustSoundVolume(float volume) | 84 | public void osAdjustSoundVolume(float volume) |
85 | { | 85 | { |
86 | OpenSim.Framework.Console.MainLog.Instance.Warn("Unimplemented function called by script: osAdjustSoundVolume(float volume)"); | 86 | OpenSim.Framework.Console.MainLog.Instance.Warn("script", "Unimplemented function called by script: osAdjustSoundVolume(float volume)"); |
87 | return; | 87 | return; |
88 | } | 88 | } |
89 | 89 | ||