Implement Scope ID lookup on GetLandData. Stacked regions were not handled

properly

2 files changed, 6 insertions, 4 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
index e15f624..86c0b85 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
@@ -35,6 +35,7 @@ using OpenSim.Server.Base;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
+using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
 {
@@ -116,7 +117,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
 
         #region ILandService
 
-        public LandData GetLandData(ulong regionHandle, uint x, uint y, out byte regionAccess)
+        public LandData GetLandData(UUID scopeID, ulong regionHandle, uint x, uint y, out byte regionAccess)
         {
             regionAccess = 2;
             m_log.DebugFormat("[LAND CONNECTOR]: request for land data in {0} at {1}, {2}",
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
index 252d9e7..766ef81 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
@@ -36,6 +36,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using OpenSim.Server.Base;
+using OpenMetaverse;
 
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
@@ -109,13 +110,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
 
         #region ILandService
 
-        public override LandData GetLandData(ulong regionHandle, uint x, uint y, out byte regionAccess)
+        public override LandData GetLandData(UUID scopeID, ulong regionHandle, uint x, uint y, out byte regionAccess)
         {
-            LandData land = m_LocalService.GetLandData(regionHandle, x, y, out regionAccess);
+            LandData land = m_LocalService.GetLandData(scopeID, regionHandle, x, y, out regionAccess);
             if (land != null)
                 return land;
 
-            return base.GetLandData(regionHandle, x, y, out regionAccess);
+            return base.GetLandData(scopeID, regionHandle, x, y, out regionAccess);
 
         }
         #endregion ILandService