aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie Thielker2014-08-04 02:23:43 +0200
committerMelanie Thielker2014-08-04 02:23:43 +0200
commit2ab0790aa8afd77424644cd5600b24092f4cd80d (patch)
tree50bd804eb228455ccb42453253f088860a698191 /OpenSim/Region/Framework/Scenes/Scene.cs
parentStop deleting objects that have status DIE_AT_EDGE set when they cross regions. (diff)
parentlocal chat gods bug fix (diff)
downloadopensim-SC_OLD-2ab0790aa8afd77424644cd5600b24092f4cd80d.zip
opensim-SC_OLD-2ab0790aa8afd77424644cd5600b24092f4cd80d.tar.gz
opensim-SC_OLD-2ab0790aa8afd77424644cd5600b24092f4cd80d.tar.bz2
opensim-SC_OLD-2ab0790aa8afd77424644cd5600b24092f4cd80d.tar.xz
Merge branch 'ubitworkmaster'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0765b3f..0266faf 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3640,13 +3640,17 @@ namespace OpenSim.Region.Framework.Scenes
3640 } 3640 }
3641 3641
3642 m_eventManager.TriggerClientClosed(agentID, this); 3642 m_eventManager.TriggerClientClosed(agentID, this);
3643// m_log.Debug("[Scene]TriggerClientClosed done");
3643 m_eventManager.TriggerOnRemovePresence(agentID); 3644 m_eventManager.TriggerOnRemovePresence(agentID);
3645// m_log.Debug("[Scene]TriggerOnRemovePresence done");
3644 3646
3645 if (!isChildAgent) 3647 if (!isChildAgent)
3646 { 3648 {
3647 if (AttachmentsModule != null) 3649 if (AttachmentsModule != null)
3648 { 3650 {
3651// m_log.Debug("[Scene]DeRezAttachments");
3649 AttachmentsModule.DeRezAttachments(avatar); 3652 AttachmentsModule.DeRezAttachments(avatar);
3653// m_log.Debug("[Scene]DeRezAttachments done");
3650 } 3654 }
3651 3655
3652 ForEachClient( 3656 ForEachClient(
@@ -3660,7 +3664,10 @@ namespace OpenSim.Region.Framework.Scenes
3660 3664
3661 // It's possible for child agents to have transactions if changes are being made cross-border. 3665 // It's possible for child agents to have transactions if changes are being made cross-border.
3662 if (AgentTransactionsModule != null) 3666 if (AgentTransactionsModule != null)
3667 {
3668// m_log.Debug("[Scene]RemoveAgentAssetTransactions");
3663 AgentTransactionsModule.RemoveAgentAssetTransactions(agentID); 3669 AgentTransactionsModule.RemoveAgentAssetTransactions(agentID);
3670 }
3664 m_log.Debug("[Scene] The avatar has left the building"); 3671 m_log.Debug("[Scene] The avatar has left the building");
3665 } 3672 }
3666 catch (Exception e) 3673 catch (Exception e)