diff options
author | Melanie | 2010-12-31 15:45:08 +0100 |
---|---|---|
committer | Melanie | 2011-01-03 19:40:55 +0000 |
commit | 9971766256e422aeb320827a51f041f3b732575b (patch) | |
tree | 8c67cf611ec4e6844610567d89cb16b18c90d04b /OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs | |
parent | Fix up a prior fix (refix the fixed fix :) (diff) | |
download | opensim-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 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs | 3 |
1 files changed, 2 insertions, 1 deletions
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; | |||
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | using OpenSim.Services.Interfaces; | 37 | using OpenSim.Services.Interfaces; |
38 | using OpenMetaverse; | ||
38 | 39 | ||
39 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land | 40 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land |
40 | { | 41 | { |
@@ -116,7 +117,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land | |||
116 | 117 | ||
117 | #region ILandService | 118 | #region ILandService |
118 | 119 | ||
119 | public LandData GetLandData(ulong regionHandle, uint x, uint y, out byte regionAccess) | 120 | public LandData GetLandData(UUID scopeID, ulong regionHandle, uint x, uint y, out byte regionAccess) |
120 | { | 121 | { |
121 | regionAccess = 2; | 122 | regionAccess = 2; |
122 | m_log.DebugFormat("[LAND CONNECTOR]: request for land data in {0} at {1}, {2}", | 123 | m_log.DebugFormat("[LAND CONNECTOR]: request for land data in {0} at {1}, {2}", |