Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 27 insertions, 6 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
index 2fd21be..fb8c306 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
         {
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -126,15 +126,36 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
 
         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);
+//            m_log.DebugFormat("[LAND IN CONNECTOR]: GetLandData for {0}. Count = {1}",
+//                regionHandle, m_Scenes.Count);
+
+            uint rx = 0, ry = 0;
+            Util.RegionHandleToWorldLoc(regionHandle, out rx, out ry);
+            rx += x;
+            ry += y;
             foreach (Scene s in m_Scenes)
             {
-                if (s.RegionInfo.RegionHandle == regionHandle)
+                uint t = s.RegionInfo.WorldLocX;
+                if( rx < t)
+                    continue;
+                t += s.RegionInfo.RegionSizeX;
+                if( rx >= t)
+                    continue;
+                t = s.RegionInfo.WorldLocY;
+                if( ry < t)
+                    continue;
+                t += s.RegionInfo.RegionSizeY;
+                if( ry  < t)
                 {
-                    m_log.Debug("[LAND IN CONNECTOR]: Found region to GetLandData from");
+//                    m_log.Debug("[LAND IN CONNECTOR]: Found region to GetLandData from");
+                    x = rx - s.RegionInfo.WorldLocX;
+                    y = ry - s.RegionInfo.WorldLocY;
                     regionAccess = s.RegionInfo.AccessLevel;
-                    return s.GetLandData(x, y);
+                    LandData land = s.GetLandData(x, y);
+                    IDwellModule dwellModule = s.RequestModuleInterface<IDwellModule>();
+                    if (dwellModule != null)
+                        land.Dwell = dwellModule.GetDwell(land);
+                    return land; 
                 }
             }
             m_log.DebugFormat("[LAND IN CONNECTOR]: region handle {0} not found", regionHandle);