Merge branch 'SledjChisl'

1 files changed, 20 insertions, 9 deletions

diff --git a/OpenSim/Services/Connectors/Land/LandServicesConnector.cs b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
index 034c42e..5492e83 100644
--- a/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
@@ -66,22 +66,31 @@ namespace OpenSim.Services.Connectors
         public virtual LandData GetLandData(UUID scopeID, ulong regionHandle, uint x, uint y, out byte regionAccess)
         {
             LandData landData = null;
-            Hashtable hash = new Hashtable();
-            hash["region_handle"] = regionHandle.ToString();
-            hash["x"] = x.ToString();
-            hash["y"] = y.ToString();
 
             IList paramList = new ArrayList();
-            paramList.Add(hash);
             regionAccess = 42; // Default to adult. Better safe...
 
             try
             {
                 uint xpos = 0, ypos = 0;
                 Util.RegionHandleToWorldLoc(regionHandle, out xpos, out ypos);
+
                 GridRegion info = m_GridService.GetRegionByPosition(scopeID, (int)xpos, (int)ypos);
                 if (info != null) // just to be sure
                 {
+                    string targetHandlestr = info.RegionHandle.ToString();
+                    if( ypos == 0 ) //HG proxy?
+                    {
+                        // this is real region handle on hg proxies hack
+                        targetHandlestr = info.RegionSecret;
+                    }
+
+                    Hashtable hash = new Hashtable();
+                    hash["region_handle"] = targetHandlestr;
+                    hash["x"] = x.ToString();
+                    hash["y"] = y.ToString();
+                    paramList.Add(hash);
+
                     XmlRpcRequest request = new XmlRpcRequest("land_data", paramList);
                     XmlRpcResponse response = request.Send(info.ServerURI, 10000);
                     if (response.IsFault)
@@ -108,17 +117,19 @@ namespace OpenSim.Services.Connectors
                             landData.UserLocation = Vector3.Parse((string)hash["UserLocation"]);
                             if (hash["RegionAccess"] != null)
                                 regionAccess = (byte)Convert.ToInt32((string)hash["RegionAccess"]);
+                            if(hash["Dwell"] != null)
+                                landData.Dwell = Convert.ToSingle((string)hash["Dwell"]);
                             m_log.DebugFormat("[LAND CONNECTOR]: Got land data for parcel {0}", landData.Name);
                         }
                         catch (Exception e)
                         {
                             m_log.ErrorFormat(
-                                "[LAND CONNECTOR]: Got exception while parsing land-data: {0} {1}", 
+                                "[LAND CONNECTOR]: Got exception while parsing land-data: {0} {1}",
                                 e.Message, e.StackTrace);
                         }
                     }
                 }
-                else 
+                else
                     m_log.WarnFormat("[LAND CONNECTOR]: Couldn't find region with handle {0}", regionHandle);
             }
             catch (Exception e)
@@ -126,8 +137,8 @@ namespace OpenSim.Services.Connectors
                 m_log.ErrorFormat(
                     "[LAND CONNECTOR]: Couldn't contact region {0}: {1} {2}", regionHandle, e.Message, e.StackTrace);
             }
-        
+
             return landData;
         }
     }
-}
\ No newline at end of file
+}