From 07ee101a057c9b5dee27c4248ce15dd8bfaae380 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 27 Aug 2014 01:09:11 +0100
Subject:  bug fix. Was not deleting attachments if on public parcel

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d7656e8..5868251 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -5967,6 +5967,9 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (nearRegion)
             {
+                if (Scene.AttachmentsModule != null)
+                    Scene.AttachmentsModule.DeleteAttachmentsFromScene(this, true);
+
                 if (!ParcelHideThisAvatar || GodLevel >= 200)
                     return;
 
@@ -5993,9 +5996,10 @@ namespace OpenSim.Region.Framework.Scenes
                     if (!p.IsChildAgent)
                         p.SendKillTo(this);
                 }
+
+                if (Scene.AttachmentsModule != null)
+                    Scene.AttachmentsModule.DeleteAttachmentsFromScene(this, true);
             }
-            if (Scene.AttachmentsModule != null)
-                Scene.AttachmentsModule.DeleteAttachmentsFromScene(this, true);
         }
 
 
-- 
cgit v1.1