diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 9e5ce8f..587f35e 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -147,6 +147,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
147 | } | 147 | } |
148 | } | 148 | } |
149 | } | 149 | } |
150 | |||
151 | public void DeleteAttachmentsFromScene(IScenePresence sp, bool silent) | ||
152 | { | ||
153 | foreach (SceneObjectGroup sop in sp.GetAttachments()) | ||
154 | { | ||
155 | sop.Scene.DeleteSceneObject(sop, silent); | ||
156 | } | ||
157 | |||
158 | sp.ClearAttachments(); | ||
159 | } | ||
150 | 160 | ||
151 | /// <summary> | 161 | /// <summary> |
152 | /// Called by client | 162 | /// Called by client |
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index c24cc17..82bdf20 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -559,11 +559,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
559 | 559 | ||
560 | protected virtual void AgentHasMovedAway(ScenePresence sp, bool logout) | 560 | protected virtual void AgentHasMovedAway(ScenePresence sp, bool logout) |
561 | { | 561 | { |
562 | foreach (SceneObjectGroup sop in sp.GetAttachments()) | 562 | sp.Scene.AttachmentsModule.DeleteAttachmentsFromScene(sp, true); |
563 | { | ||
564 | sop.Scene.DeleteSceneObject(sop, true); | ||
565 | } | ||
566 | sp.ClearAttachments(); | ||
567 | } | 563 | } |
568 | 564 | ||
569 | protected void KillEntity(Scene scene, uint localID) | 565 | protected void KillEntity(Scene scene, uint localID) |