aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorAdam Frisby2007-07-20 01:32:27 +0000
committerAdam Frisby2007-07-20 01:32:27 +0000
commit765ff13f22ce062066e461b73f0aa6881b4fea29 (patch)
treea69ce2fbbff788416fc0b0fb3f8438f00e95aac1 /OpenSim/Region/Environment
parent* New log functions which include the module name as an argument. (diff)
downloadopensim-SC_OLD-765ff13f22ce062066e461b73f0aa6881b4fea29.zip
opensim-SC_OLD-765ff13f22ce062066e461b73f0aa6881b4fea29.tar.gz
opensim-SC_OLD-765ff13f22ce062066e461b73f0aa6881b4fea29.tar.bz2
opensim-SC_OLD-765ff13f22ce062066e461b73f0aa6881b4fea29.tar.xz
* Assortment of Console changes - console messages are now grouped into modules (eg "client", "grid", "terrain", "storage", etc)
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs12
-rw-r--r--OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs4
3 files changed, 9 insertions, 9 deletions
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