aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authoropensim mirror account2010-11-16 14:00:07 -0800
committeropensim mirror account2010-11-16 14:00:07 -0800
commit21b7cc5d61d9f1c83ce2daaa4a9e3142d5aa42d0 (patch)
treeb73a2aa9f04e9c34281fb38512da3eb800396769 /OpenSim/Region/Framework/Scenes/Scene.cs
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentChange the way attachments are persisted. Editing a worn attachment will now (diff)
downloadopensim-SC-21b7cc5d61d9f1c83ce2daaa4a9e3142d5aa42d0.zip
opensim-SC-21b7cc5d61d9f1c83ce2daaa4a9e3142d5aa42d0.tar.gz
opensim-SC-21b7cc5d61d9f1c83ce2daaa4a9e3142d5aa42d0.tar.bz2
opensim-SC-21b7cc5d61d9f1c83ce2daaa4a9e3142d5aa42d0.tar.xz
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a4cc66d..96a9f99 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3152,7 +3152,6 @@ namespace OpenSim.Region.Framework.Scenes
3152 List<ulong> regions = new List<ulong>(avatar.KnownChildRegionHandles); 3152 List<ulong> regions = new List<ulong>(avatar.KnownChildRegionHandles);
3153 regions.Remove(RegionInfo.RegionHandle); 3153 regions.Remove(RegionInfo.RegionHandle);
3154 m_sceneGridService.SendCloseChildAgentConnections(agentID, regions); 3154 m_sceneGridService.SendCloseChildAgentConnections(agentID, regions);
3155
3156 } 3155 }
3157 m_eventManager.TriggerClientClosed(agentID, this); 3156 m_eventManager.TriggerClientClosed(agentID, this);
3158 } 3157 }
@@ -3164,6 +3163,9 @@ namespace OpenSim.Region.Framework.Scenes
3164 3163
3165 m_eventManager.TriggerOnRemovePresence(agentID); 3164 m_eventManager.TriggerOnRemovePresence(agentID);
3166 3165
3166 if (avatar != null && (!avatar.IsChildAgent))
3167 avatar.SaveChangedAttachments();
3168
3167 ForEachClient( 3169 ForEachClient(
3168 delegate(IClientAPI client) 3170 delegate(IClientAPI client)
3169 { 3171 {