diff options
author | Justin Clark-Casey (justincc) | 2012-02-09 00:10:45 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-02-09 00:10:45 +0000 |
commit | dbe32a1f6d148d16c462b3b7d5a6c507743a5f9a (patch) | |
tree | 1f7894b886ddd09a6d0e2e14addafd8c5fd67663 | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-dbe32a1f6d148d16c462b3b7d5a6c507743a5f9a.zip opensim-SC_OLD-dbe32a1f6d148d16c462b3b7d5a6c507743a5f9a.tar.gz opensim-SC_OLD-dbe32a1f6d148d16c462b3b7d5a6c507743a5f9a.tar.bz2 opensim-SC_OLD-dbe32a1f6d148d16c462b3b7d5a6c507743a5f9a.tar.xz |
minor: put in commented out logging statements for future reuse
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index 6a48b89..8701431 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
@@ -292,13 +292,16 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
292 | NPCAvatar av; | 292 | NPCAvatar av; |
293 | if (m_avatars.TryGetValue(agentID, out av)) | 293 | if (m_avatars.TryGetValue(agentID, out av)) |
294 | { | 294 | { |
295 | // m_log.DebugFormat("[NPC MODULE]: Found {0} {1} to remove", agentID, av.Name); | ||
295 | scene.RemoveClient(agentID, false); | 296 | scene.RemoveClient(agentID, false); |
296 | m_avatars.Remove(agentID); | 297 | m_avatars.Remove(agentID); |
297 | 298 | ||
299 | // m_log.DebugFormat("[NPC MODULE]: Removed {0} {1}", agentID, av.Name); | ||
298 | return true; | 300 | return true; |
299 | } | 301 | } |
300 | } | 302 | } |
301 | 303 | ||
304 | // m_log.DebugFormat("[NPC MODULE]: Could not find {0} to remove", agentID); | ||
302 | return false; | 305 | return false; |
303 | } | 306 | } |
304 | 307 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 9b93135..bc1902b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -537,6 +537,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
537 | 537 | ||
538 | public bool Stop(int timeout) | 538 | public bool Stop(int timeout) |
539 | { | 539 | { |
540 | // m_log.DebugFormat( | ||
541 | // "[SCRIPT INSTANCE]: Stopping script {0} {1} with timeout {2}", ScriptName, ItemID, timeout); | ||
542 | |||
540 | IScriptWorkItem result; | 543 | IScriptWorkItem result; |
541 | 544 | ||
542 | lock (m_EventQueue) | 545 | lock (m_EventQueue) |
@@ -769,7 +772,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
769 | } | 772 | } |
770 | catch (Exception e) | 773 | catch (Exception e) |
771 | { | 774 | { |
772 | // m_log.DebugFormat("[SCRIPT] Exception: {0}", e.Message); | 775 | // m_log.DebugFormat( |
776 | // "[SCRIPT] Exception in script {0} {1}: {2}{3}", | ||
777 | // ScriptName, ItemID, e.Message, e.StackTrace); | ||
778 | |||
773 | m_InEvent = false; | 779 | m_InEvent = false; |
774 | m_CurrentEvent = String.Empty; | 780 | m_CurrentEvent = String.Empty; |
775 | 781 | ||