diff options
author | UbitUmarov | 2016-09-17 12:44:52 +0100 |
---|---|---|
committer | UbitUmarov | 2016-09-17 12:44:52 +0100 |
commit | e5383604cb68710b1f9960d6a0aeb0812d2db3ea (patch) | |
tree | 844cb56f494c58c123cd167280673dae58f89f16 /OpenSim/Region/Framework/Scenes/EventManager.cs | |
parent | forgot the dll (diff) | |
parent | change spinobject math, and a few minor things (diff) | |
download | opensim-SC-e5383604cb68710b1f9960d6a0aeb0812d2db3ea.zip opensim-SC-e5383604cb68710b1f9960d6a0aeb0812d2db3ea.tar.gz opensim-SC-e5383604cb68710b1f9960d6a0aeb0812d2db3ea.tar.bz2 opensim-SC-e5383604cb68710b1f9960d6a0aeb0812d2db3ea.tar.xz |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 8683599..6ff3049 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -1881,7 +1881,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1881 | catch (Exception e) | 1881 | catch (Exception e) |
1882 | { | 1882 | { |
1883 | m_log.ErrorFormat( | 1883 | m_log.ErrorFormat( |
1884 | "[EVENT MANAGER]: Delegate for TriggerOnAttach failed - continuing. {0} {1}", | 1884 | "[EVENT MANAGER]: Delegate for TriggerGroupMove failed - continuing. {0} {1}", |
1885 | e.Message, e.StackTrace); | 1885 | e.Message, e.StackTrace); |
1886 | } | 1886 | } |
1887 | } | 1887 | } |