diff options
| author | Melanie Thielker | 2014-08-04 02:23:43 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-08-04 02:23:43 +0200 |
| commit | 2ab0790aa8afd77424644cd5600b24092f4cd80d (patch) | |
| tree | 50bd804eb228455ccb42453253f088860a698191 /OpenSim/Region/Framework/Scenes/EventManager.cs | |
| parent | Stop deleting objects that have status DIE_AT_EDGE set when they cross regions. (diff) | |
| parent | local chat gods bug fix (diff) | |
| download | opensim-SC-2ab0790aa8afd77424644cd5600b24092f4cd80d.zip opensim-SC-2ab0790aa8afd77424644cd5600b24092f4cd80d.tar.gz opensim-SC-2ab0790aa8afd77424644cd5600b24092f4cd80d.tar.bz2 opensim-SC-2ab0790aa8afd77424644cd5600b24092f4cd80d.tar.xz | |
Merge branch 'ubitworkmaster'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 7f06e82..692e0c9 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
| @@ -1366,7 +1366,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1366 | { | 1366 | { |
| 1367 | try | 1367 | try |
| 1368 | { | 1368 | { |
| 1369 | // m_log.ErrorFormat("[EVENT MANAGER]: OnRemovePresenceDelegate: {0}",d.Target.ToString()); | ||
| 1369 | d(agentId); | 1370 | d(agentId); |
| 1371 | // m_log.ErrorFormat("[EVENT MANAGER]: OnRemovePresenceDelegate done "); | ||
| 1370 | } | 1372 | } |
| 1371 | catch (Exception e) | 1373 | catch (Exception e) |
| 1372 | { | 1374 | { |
| @@ -2037,7 +2039,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2037 | { | 2039 | { |
| 2038 | try | 2040 | try |
| 2039 | { | 2041 | { |
| 2042 | // m_log.ErrorFormat("[EVENT MANAGER]: TriggerClientClosed: {0}", d.Target.ToString()); | ||
| 2040 | d(ClientID, scene); | 2043 | d(ClientID, scene); |
| 2044 | // m_log.ErrorFormat("[EVENT MANAGER]: TriggerClientClosed done "); | ||
| 2045 | |||
| 2041 | } | 2046 | } |
| 2042 | catch (Exception e) | 2047 | catch (Exception e) |
| 2043 | { | 2048 | { |