diff options
author | Justin Clark-Casey (justincc) | 2011-03-22 23:47:36 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-03-22 23:47:36 +0000 |
commit | b34743e5fe6b0783caa62c014ff86e2ec76c8184 (patch) | |
tree | f8f8acbff4265321ea3919b635fa925583d7b445 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
parent | Typo fix (diff) | |
download | opensim-SC-b34743e5fe6b0783caa62c014ff86e2ec76c8184.zip opensim-SC-b34743e5fe6b0783caa62c014ff86e2ec76c8184.tar.gz opensim-SC-b34743e5fe6b0783caa62c014ff86e2ec76c8184.tar.bz2 opensim-SC-b34743e5fe6b0783caa62c014ff86e2ec76c8184.tar.xz |
Add an initial confidence-building TestAddObject() for prim counts.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 734ba22..eca2786 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -627,7 +627,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
627 | if (!Entities.Remove(agentID)) | 627 | if (!Entities.Remove(agentID)) |
628 | { | 628 | { |
629 | m_log.WarnFormat( | 629 | m_log.WarnFormat( |
630 | "[SCENE]: Tried to remove non-existent scene presence with agent ID {0} from scene Entities list", | 630 | "[SCENEGRAPH]: Tried to remove non-existent scene presence with agent ID {0} from scene Entities list", |
631 | agentID); | 631 | agentID); |
632 | } | 632 | } |
633 | 633 | ||
@@ -650,7 +650,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
650 | } | 650 | } |
651 | else | 651 | else |
652 | { | 652 | { |
653 | m_log.WarnFormat("[SCENE]: Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID); | 653 | m_log.WarnFormat("[SCENEGRAPH]: Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID); |
654 | } | 654 | } |
655 | } | 655 | } |
656 | } | 656 | } |
@@ -1079,7 +1079,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1079 | catch (Exception e) | 1079 | catch (Exception e) |
1080 | { | 1080 | { |
1081 | // Catch it and move on. This includes situations where splist has inconsistent info | 1081 | // Catch it and move on. This includes situations where splist has inconsistent info |
1082 | m_log.WarnFormat("[SCENE]: Problem processing action in ForEachSOG: ", e.ToString()); | 1082 | m_log.WarnFormat( |
1083 | "[SCENEGRAPH]: Problem processing action in ForEachSOG: {0} {1}", e.Message, e.StackTrace); | ||
1083 | } | 1084 | } |
1084 | } | 1085 | } |
1085 | } | 1086 | } |
@@ -1103,8 +1104,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1103 | } | 1104 | } |
1104 | catch (Exception e) | 1105 | catch (Exception e) |
1105 | { | 1106 | { |
1106 | m_log.Info("[BUG] in " + m_parentScene.RegionInfo.RegionName + ": " + e.ToString()); | 1107 | m_log.Info("[SCENEGRAPH]: Error in " + m_parentScene.RegionInfo.RegionName + ": " + e.ToString()); |
1107 | m_log.Info("[BUG] Stack Trace: " + e.StackTrace); | 1108 | m_log.Info("[SCENEGRAPH]: Stack Trace: " + e.StackTrace); |
1108 | } | 1109 | } |
1109 | }); | 1110 | }); |
1110 | Parallel.ForEach<ScenePresence>(GetScenePresences(), protectedAction); | 1111 | Parallel.ForEach<ScenePresence>(GetScenePresences(), protectedAction); |
@@ -1119,7 +1120,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1119 | } | 1120 | } |
1120 | catch (Exception e) | 1121 | catch (Exception e) |
1121 | { | 1122 | { |
1122 | m_log.Info("[BUG] in " + m_parentScene.RegionInfo.RegionName + ": " + e.ToString()); | 1123 | m_log.Error("[SCENEGRAPH]: Error in " + m_parentScene.RegionInfo.RegionName + ": " + e.ToString()); |
1123 | } | 1124 | } |
1124 | } | 1125 | } |
1125 | } | 1126 | } |