aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-22 03:32:45 +0000
committerMelanie Thielker2008-10-22 03:32:45 +0000
commitf9b3ef32c620b5b46a43570cd47c5690c336b31c (patch)
tree13907e8772f4ef6d1f8b8ede40866c38dbd783a8 /OpenSim/Region
parent* Add a config option for filtering collisions. Sometimes, under load, this... (diff)
downloadopensim-SC_OLD-f9b3ef32c620b5b46a43570cd47c5690c336b31c.zip
opensim-SC_OLD-f9b3ef32c620b5b46a43570cd47c5690c336b31c.tar.gz
opensim-SC_OLD-f9b3ef32c620b5b46a43570cd47c5690c336b31c.tar.bz2
opensim-SC_OLD-f9b3ef32c620b5b46a43570cd47c5690c336b31c.tar.xz
Remove the gratuitious prim deletes caused by linking. This makes linking
a bit faster.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 50d0a72..0f96cf2 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1880,7 +1880,9 @@ namespace OpenSim.Region.Environment.Scenes
1880 { 1880 {
1881 if (m_innerScene.DeleteSceneObject(uuid, resultOfLinkingObjects)) 1881 if (m_innerScene.DeleteSceneObject(uuid, resultOfLinkingObjects))
1882 { 1882 {
1883 m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID); 1883 if (!resultOfLinkingObjects)
1884 m_storageManager.DataStore.RemoveObject(uuid,
1885 m_regInfo.RegionID);
1884 return true; 1886 return true;
1885 } 1887 }
1886 1888