aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
authorJonathan Freedman2010-10-05 14:17:18 -0400
committerJonathan Freedman2010-10-05 14:17:18 -0400
commit8f1acb890ac49ea004bf43065ce8d3472bb27708 (patch)
tree07e4e5fc77f764232c958bdbf8f93f2651da1663 /OpenSim/Region/Framework/Scenes/SceneGraph.cs
parentMerge branch 'master' of git://opensimulator.org/git/opensim (diff)
parentFormatting cleanup. (diff)
downloadopensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.zip
opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.gz
opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.bz2
opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.xz
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index a79dc98..f81c551 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1073,7 +1073,7 @@ namespace OpenSim.Region.Framework.Scenes
1073 catch (Exception e) 1073 catch (Exception e)
1074 { 1074 {
1075 // Catch it and move on. This includes situations where splist has inconsistent info 1075 // Catch it and move on. This includes situations where splist has inconsistent info
1076 m_log.WarnFormat("[SCENE]: Problem processing action in ForEachSOG: ", e.Message); 1076 m_log.WarnFormat("[SCENE]: Problem processing action in ForEachSOG: ", e.ToString());
1077 } 1077 }
1078 } 1078 }
1079 } 1079 }
@@ -1114,7 +1114,6 @@ namespace OpenSim.Region.Framework.Scenes
1114 catch (Exception e) 1114 catch (Exception e)
1115 { 1115 {
1116 m_log.Info("[BUG] in " + m_parentScene.RegionInfo.RegionName + ": " + e.ToString()); 1116 m_log.Info("[BUG] in " + m_parentScene.RegionInfo.RegionName + ": " + e.ToString());
1117 m_log.Info("[BUG] Stack Trace: " + e.StackTrace);
1118 } 1117 }
1119 } 1118 }
1120 } 1119 }