aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
diff options
context:
space:
mode:
authorMelanie2010-12-31 15:45:08 +0100
committerMelanie2011-01-03 19:40:55 +0000
commit9971766256e422aeb320827a51f041f3b732575b (patch)
tree8c67cf611ec4e6844610567d89cb16b18c90d04b /OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
parentFix up a prior fix (refix the fixed fix :) (diff)
downloadopensim-SC_OLD-9971766256e422aeb320827a51f041f3b732575b.zip
opensim-SC_OLD-9971766256e422aeb320827a51f041f3b732575b.tar.gz
opensim-SC_OLD-9971766256e422aeb320827a51f041f3b732575b.tar.bz2
opensim-SC_OLD-9971766256e422aeb320827a51f041f3b732575b.tar.xz
Implement Scope ID lookup on GetLandData. Stacked regions were not handled
properly
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs7
1 files changed, 4 insertions, 3 deletions
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;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Services.Interfaces; 37using OpenSim.Services.Interfaces;
38using OpenSim.Server.Base; 38using OpenSim.Server.Base;
39using OpenMetaverse;
39 40
40 41
41namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land 42namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
@@ -109,13 +110,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
109 110
110 #region ILandService 111 #region ILandService
111 112
112 public override LandData GetLandData(ulong regionHandle, uint x, uint y, out byte regionAccess) 113 public override LandData GetLandData(UUID scopeID, ulong regionHandle, uint x, uint y, out byte regionAccess)
113 { 114 {
114 LandData land = m_LocalService.GetLandData(regionHandle, x, y, out regionAccess); 115 LandData land = m_LocalService.GetLandData(scopeID, regionHandle, x, y, out regionAccess);
115 if (land != null) 116 if (land != null)
116 return land; 117 return land;
117 118
118 return base.GetLandData(regionHandle, x, y, out regionAccess); 119 return base.GetLandData(scopeID, regionHandle, x, y, out regionAccess);
119 120
120 } 121 }
121 #endregion ILandService 122 #endregion ILandService