aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land
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/ServiceConnectorsIn/Land
parentFix up a prior fix (refix the fixed fix :) (diff)
downloadopensim-SC-9971766256e422aeb320827a51f041f3b732575b.zip
opensim-SC-9971766256e422aeb320827a51f041f3b732575b.tar.gz
opensim-SC-9971766256e422aeb320827a51f041f3b732575b.tar.bz2
opensim-SC-9971766256e422aeb320827a51f041f3b732575b.tar.xz
Implement Scope ID lookup on GetLandData. Stacked regions were not handled
properly
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsIn/Land')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs3
1 files changed, 2 insertions, 1 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;
37using OpenSim.Server.Base; 37using OpenSim.Server.Base;
38using OpenSim.Server.Handlers.Base; 38using OpenSim.Server.Handlers.Base;
39using OpenSim.Services.Interfaces; 39using OpenSim.Services.Interfaces;
40using OpenMetaverse;
40 41
41 42
42namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land 43namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
@@ -121,7 +122,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
121 122
122 #region ILandService 123 #region ILandService
123 124
124 public LandData GetLandData(ulong regionHandle, uint x, uint y, out byte regionAccess) 125 public LandData GetLandData(UUID scopeID, ulong regionHandle, uint x, uint y, out byte regionAccess)
125 { 126 {
126 m_log.DebugFormat("[LAND IN CONNECTOR]: GetLandData for {0}. Count = {1}", 127 m_log.DebugFormat("[LAND IN CONNECTOR]: GetLandData for {0}. Count = {1}",
127 regionHandle, m_Scenes.Count); 128 regionHandle, m_Scenes.Count);