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

properly

8 files changed, 47 insertions, 44 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
index 23251c9..fcc69e9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
@@ -37,6 +37,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Server.Base;
 using OpenSim.Server.Handlers.Base;
 using OpenSim.Services.Interfaces;
+using OpenMetaverse;
 
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
@@ -121,7 +122,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.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)
         {
             m_log.DebugFormat("[LAND IN CONNECTOR]: GetLandData for {0}. Count = {1}",
                 regionHandle, m_Scenes.Count);
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
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 8449cc1..001ad87 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1535,40 +1535,40 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (parcelID == UUID.Zero)
                 return;
 
-            ExtendedLandData data =
-                (ExtendedLandData)parcelInfoCache.Get(parcelID.ToString(),
-                                                      delegate(string id)
-                                                      {
-                                                          UUID parcel = UUID.Zero;
-                                                          UUID.TryParse(id, out parcel);
-                                                          // assume we've got the parcelID we just computed in RemoteParcelRequest
-                                                          ExtendedLandData extLandData = new ExtendedLandData();
-                                                          Util.ParseFakeParcelID(parcel, out extLandData.RegionHandle,
-                                                                                 out extLandData.X, out extLandData.Y);
-                                                          m_log.DebugFormat("[LAND] got parcelinfo request for regionHandle {0}, x/y {1}/{2}",
-                                                                            extLandData.RegionHandle, extLandData.X, extLandData.Y);
-
-                                                          // for this region or for somewhere else?
-                                                          if (extLandData.RegionHandle == m_scene.RegionInfo.RegionHandle)
-                                                          {
-                                                              extLandData.LandData = this.GetLandObject(extLandData.X, extLandData.Y).LandData;
-                                                              extLandData.RegionAccess = m_scene.RegionInfo.AccessLevel;
-                                                          }
-                                                          else
-                                                          {
-                                                              ILandService landService = m_scene.RequestModuleInterface<ILandService>();
-                                                              extLandData.LandData = landService.GetLandData(extLandData.RegionHandle,
-                                                                                                             extLandData.X,
-                                                                                                             extLandData.Y,
-                                                                                                             out extLandData.RegionAccess);
-                                                              if (extLandData.LandData == null)
-                                                              {
-                                                                  // we didn't find the region/land => don't cache
-                                                                  return null;
-                                                              }
-                                                          }
-                                                          return extLandData;
-                                                      });
+            ExtendedLandData data = (ExtendedLandData)parcelInfoCache.Get(parcelID.ToString(),
+                    delegate(string id)
+                    {
+                        UUID parcel = UUID.Zero;
+                        UUID.TryParse(id, out parcel);
+                        // assume we've got the parcelID we just computed in RemoteParcelRequest
+                        ExtendedLandData extLandData = new ExtendedLandData();
+                        Util.ParseFakeParcelID(parcel, out extLandData.RegionHandle,
+                                               out extLandData.X, out extLandData.Y);
+                        m_log.DebugFormat("[LAND] got parcelinfo request for regionHandle {0}, x/y {1}/{2}",
+                                          extLandData.RegionHandle, extLandData.X, extLandData.Y);
+
+                        // for this region or for somewhere else?
+                        if (extLandData.RegionHandle == m_scene.RegionInfo.RegionHandle)
+                        {
+                            extLandData.LandData = this.GetLandObject(extLandData.X, extLandData.Y).LandData;
+                            extLandData.RegionAccess = m_scene.RegionInfo.AccessLevel;
+                        }
+                        else
+                        {
+                            ILandService landService = m_scene.RequestModuleInterface<ILandService>();
+                            extLandData.LandData = landService.GetLandData(m_scene.RegionInfo.ScopeID,
+                                    extLandData.RegionHandle,
+                                    extLandData.X,
+                                    extLandData.Y,
+                                    out extLandData.RegionAccess);
+                            if (extLandData.LandData == null)
+                            {
+                                // we didn't find the region/land => don't cache
+                                return null;
+                            }
+                        }
+                        return extLandData;
+                    });
 
             if (data != null)  // if we found some data, send it
             {
diff --git a/OpenSim/Server/Handlers/Land/LandHandlers.cs b/OpenSim/Server/Handlers/Land/LandHandlers.cs
index 561f285..b45289a 100644
--- a/OpenSim/Server/Handlers/Land/LandHandlers.cs
+++ b/OpenSim/Server/Handlers/Land/LandHandlers.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Server.Handlers.Land
             m_log.DebugFormat("[LAND HANDLER]: Got request for land data at {0}, {1} for region {2}", x, y, regionHandle);
 
             byte regionAccess;
-            LandData landData = m_LocalService.GetLandData(regionHandle, x, y, out regionAccess);
+            LandData landData = m_LocalService.GetLandData(UUID.Zero, regionHandle, x, y, out regionAccess);
             Hashtable hash = new Hashtable();
             if (landData != null)
             {
diff --git a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs
index 10499e2..ba39c99 100644
--- a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Services.Connectors
             m_GridService = gridServices;
         }
 
-        public virtual LandData GetLandData(ulong regionHandle, uint x, uint y, out byte regionAccess)
+        public virtual LandData GetLandData(UUID scopeID, ulong regionHandle, uint x, uint y, out byte regionAccess)
         {
             LandData landData = null;
             Hashtable hash = new Hashtable();
@@ -80,7 +80,7 @@ namespace OpenSim.Services.Connectors
             {
                 uint xpos = 0, ypos = 0;
                 Utils.LongToUInts(regionHandle, out xpos, out ypos);
-                GridRegion info = m_GridService.GetRegionByPosition(UUID.Zero, (int)xpos, (int)ypos);
+                GridRegion info = m_GridService.GetRegionByPosition(scopeID, (int)xpos, (int)ypos);
                 if (info != null) // just to be sure
                 {
                     XmlRpcRequest request = new XmlRpcRequest("land_data", paramList);
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
index 93da10e..9e444c4 100644
--- a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Services.Connectors
         {
             uint x = 0, y = 0;
             Utils.LongToUInts(regionHandle, out x, out y);
-            GridRegion regInfo = m_GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
+            GridRegion regInfo = m_GridService.GetRegionByPosition(thisRegion.ScopeID, (int)x, (int)y);
             if ((regInfo != null) &&
                 // Don't remote-call this instance; that's a startup hickup
                 !((regInfo.ExternalHostName == thisRegion.ExternalHostName) && (regInfo.HttpPort == thisRegion.HttpPort)))
diff --git a/OpenSim/Services/Interfaces/ILandService.cs b/OpenSim/Services/Interfaces/ILandService.cs
index 7a12aff..63d9a27 100644
--- a/OpenSim/Services/Interfaces/ILandService.cs
+++ b/OpenSim/Services/Interfaces/ILandService.cs
@@ -33,6 +33,6 @@ namespace OpenSim.Services.Interfaces
 {
     public interface ILandService
     {
-        LandData GetLandData(ulong regionHandle, uint x, uint y, out byte regionAccess);
+        LandData GetLandData(UUID scopeID, ulong regionHandle, uint x, uint y, out byte regionAccess);
     }
 }