aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorubit2012-07-19 12:15:07 +0200
committerubit2012-07-19 12:15:07 +0200
commit1c6e7de2dc873b596c4d5c64bac7aef44dfdef47 (patch)
treeac2fd76ddf955e640a1feb981607c6bfe5539529 /OpenSim/Region/Framework
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentUpdate ubitMesh primMesher with new Dahlia version on core ( reckick git (diff)
downloadopensim-SC_OLD-1c6e7de2dc873b596c4d5c64bac7aef44dfdef47.zip
opensim-SC_OLD-1c6e7de2dc873b596c4d5c64bac7aef44dfdef47.tar.gz
opensim-SC_OLD-1c6e7de2dc873b596c4d5c64bac7aef44dfdef47.tar.bz2
opensim-SC_OLD-1c6e7de2dc873b596c4d5c64bac7aef44dfdef47.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 76a952b..d783e57 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -1210,6 +1210,7 @@ namespace OpenSim.Region.Framework.Scenes
1210 m_log.ErrorFormat( 1210 m_log.ErrorFormat(
1211 "[EVENT MANAGER]: Delegate for TriggerRemoveScript failed - continuing. {0} {1}", 1211 "[EVENT MANAGER]: Delegate for TriggerRemoveScript failed - continuing. {0} {1}",
1212 e.Message, e.StackTrace); 1212 e.Message, e.StackTrace);
1213 m_log.ErrorFormat(Environment.StackTrace);
1213 } 1214 }
1214 } 1215 }
1215 } 1216 }