From 81474d69594dd148a4bcaaf8a04ca4df22621e13 Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Fri, 6 Nov 2020 22:18:31 +0000
Subject: [PATCH] add post displacement clip on oar load

---
 .../CoreModules/World/Archiver/ArchiveReadRequest.cs       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 01ba1b26ce..c4552587ab 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -604,6 +604,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     if (m_displacement != Vector3.Zero)
                     {
                         pos += m_displacement;
+                        if (pos.X < 0 || pos.X >= scene.RegionInfo.RegionSizeX
+                            || pos.Y < 0 || pos.Y >= scene.RegionInfo.RegionSizeY
+                            || pos.Z < Constants.MinSimulationHeight || pos.Z > Constants.MaxSimulationHeight)
+                        {
+                            if (m_debug) m_log.DebugFormat("[ARCHIVER]: Skipping object from OAR After displacement clip {0}.", pos.ToString());
+                            continue;
+                        }
                         if (m_debug) m_log.DebugFormat("[ARCHIVER]: After displacement, object from OAR is at scene position {0}.", pos.ToString());
                     }
                     sceneObject.AbsolutePosition = pos;