aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2010-10-03 22:38:32 +0100
committerMelanie2010-10-03 22:38:32 +0100
commit48988bf4e9635705cfe7d751b78476215500c5aa (patch)
tree58327ff8869b6dfd137c7a651e75a737de2389ca /OpenSim/Region/Framework
parentAdd the Warp3D dll (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-48988bf4e9635705cfe7d751b78476215500c5aa.zip
opensim-SC_OLD-48988bf4e9635705cfe7d751b78476215500c5aa.tar.gz
opensim-SC_OLD-48988bf4e9635705cfe7d751b78476215500c5aa.tar.bz2
opensim-SC_OLD-48988bf4e9635705cfe7d751b78476215500c5aa.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
-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 1163ebf..d4e3717 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1136,7 +1136,7 @@ namespace OpenSim.Region.Framework.Scenes
1136 catch (Exception e) 1136 catch (Exception e)
1137 { 1137 {
1138 // Catch it and move on. This includes situations where splist has inconsistent info 1138 // Catch it and move on. This includes situations where splist has inconsistent info
1139 m_log.WarnFormat("[SCENE]: Problem processing action in ForEachSOG: ", e.Message); 1139 m_log.WarnFormat("[SCENE]: Problem processing action in ForEachSOG: ", e.ToString());
1140 } 1140 }
1141 } 1141 }
1142 } 1142 }
@@ -1177,7 +1177,6 @@ namespace OpenSim.Region.Framework.Scenes
1177 catch (Exception e) 1177 catch (Exception e)
1178 { 1178 {
1179 m_log.Info("[BUG] in " + m_parentScene.RegionInfo.RegionName + ": " + e.ToString()); 1179 m_log.Info("[BUG] in " + m_parentScene.RegionInfo.RegionName + ": " + e.ToString());
1180 m_log.Info("[BUG] Stack Trace: " + e.StackTrace);
1181 } 1180 }
1182 } 1181 }
1183 } 1182 }