From bef8ea8bcc01bf6e478e190932e3abbb83c966b1 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 19 Jan 2019 07:09:39 +0000 Subject: [PATCH] mantis 8458: don't forget prims on search map on link/unlink --- OpenSim/Region/Framework/Scenes/SceneGraph.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 17efcc5cc6..206e3179da 100755 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs @@ -573,14 +573,16 @@ namespace OpenSim.Region.Framework.Scenes m_scenePartsLock.EnterWriteLock(); entered = true; } - - for (int i = 0; i < parts.Length; ++i) + if (!resultOfObjectLinked) { - part = parts[i]; - m_scenePartsByID.Remove(part.UUID); - m_scenePartsByLocalID.Remove(part.LocalId); + for (int i = 0; i < parts.Length; ++i) + { + part = parts[i]; + m_scenePartsByID.Remove(part.UUID); + m_scenePartsByLocalID.Remove(part.LocalId); + } + m_scenePartsArray = null; } - m_scenePartsArray = null; ret = Entities.Remove(uuid); } finally