aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorUbitUmarov2016-08-12 03:58:04 +0100
committerUbitUmarov2016-08-12 03:58:04 +0100
commitc04792142f332b7d1e892eb739b7e0b70b3bd0e7 (patch)
tree7a6549d3ca27504ca456ff8e2a07e082c5bbc3b8 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parent remove code from httptests branch (diff)
downloadopensim-SC_OLD-c04792142f332b7d1e892eb739b7e0b70b3bd0e7.zip
opensim-SC_OLD-c04792142f332b7d1e892eb739b7e0b70b3bd0e7.tar.gz
opensim-SC_OLD-c04792142f332b7d1e892eb739b7e0b70b3bd0e7.tar.bz2
opensim-SC_OLD-c04792142f332b7d1e892eb739b7e0b70b3bd0e7.tar.xz
partially revert commit 42a9afdc43cc.. of 06-12 not allowing more updates to be enqueued on deleted objects. Keep the catch up on deenqueue, so preserving the race condition safe guard. Let Scene sendkillObject work even if object is flaged as deleted. Still not clear how this are related to mantis 7858 or even less to 7990.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index bc603ae..ca5951c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -5420,6 +5420,9 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
5420 5420
5421 public void SendTerseUpdateToClient(IClientAPI remoteClient) 5421 public void SendTerseUpdateToClient(IClientAPI remoteClient)
5422 { 5422 {
5423 if (ParentGroup.IsDeleted)
5424 return;
5425
5423 if (ParentGroup.IsAttachment 5426 if (ParentGroup.IsAttachment
5424 && (ParentGroup.RootPart != this 5427 && (ParentGroup.RootPart != this
5425 || ParentGroup.AttachedAvatar != remoteClient.AgentId && ParentGroup.HasPrivateAttachmentPoint)) 5428 || ParentGroup.AttachedAvatar != remoteClient.AgentId && ParentGroup.HasPrivateAttachmentPoint))