aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2014-08-27 01:09:11 +0100
committerUbitUmarov2014-08-27 01:09:11 +0100
commit07ee101a057c9b5dee27c4248ce15dd8bfaae380 (patch)
tree42bba4f164f27a452d4f7bd85efbeb95b77d5845
parent on TPs to nearby regions, only send kills if needed by parcel privacy (diff)
downloadopensim-SC-07ee101a057c9b5dee27c4248ce15dd8bfaae380.zip
opensim-SC-07ee101a057c9b5dee27c4248ce15dd8bfaae380.tar.gz
opensim-SC-07ee101a057c9b5dee27c4248ce15dd8bfaae380.tar.bz2
opensim-SC-07ee101a057c9b5dee27c4248ce15dd8bfaae380.tar.xz
bug fix. Was not deleting attachments if on public parcel
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
1 files changed, 6 insertions, 2 deletions
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
5967 5967
5968 if (nearRegion) 5968 if (nearRegion)
5969 { 5969 {
5970 if (Scene.AttachmentsModule != null)
5971 Scene.AttachmentsModule.DeleteAttachmentsFromScene(this, true);
5972
5970 if (!ParcelHideThisAvatar || GodLevel >= 200) 5973 if (!ParcelHideThisAvatar || GodLevel >= 200)
5971 return; 5974 return;
5972 5975
@@ -5993,9 +5996,10 @@ namespace OpenSim.Region.Framework.Scenes
5993 if (!p.IsChildAgent) 5996 if (!p.IsChildAgent)
5994 p.SendKillTo(this); 5997 p.SendKillTo(this);
5995 } 5998 }
5999
6000 if (Scene.AttachmentsModule != null)
6001 Scene.AttachmentsModule.DeleteAttachmentsFromScene(this, true);
5996 } 6002 }
5997 if (Scene.AttachmentsModule != null)
5998 Scene.AttachmentsModule.DeleteAttachmentsFromScene(this, true);
5999 } 6003 }
6000 6004
6001 6005