diff options
| author | Mic Bowman | 2011-01-03 17:05:24 -0800 |
|---|---|---|
| committer | Mic Bowman | 2011-01-03 17:05:24 -0800 |
| commit | d3987024d776f08c4eabba4df8353971aa9466b8 (patch) | |
| tree | eeb635c58f18a5592578682b36aa430da8286fd6 /OpenSim/Services/Connectors/Land/LandServiceConnector.cs | |
| parent | Standardize the way WebRequests are made in the SimulationServiceConnector. A... (diff) | |
| parent | Add permissions hooks for object transfers (diff) | |
| download | opensim-SC-d3987024d776f08c4eabba4df8353971aa9466b8.zip opensim-SC-d3987024d776f08c4eabba4df8353971aa9466b8.tar.gz opensim-SC-d3987024d776f08c4eabba4df8353971aa9466b8.tar.bz2 opensim-SC-d3987024d776f08c4eabba4df8353971aa9466b8.tar.xz | |
Merge branch 'master' into cmickeyb
Diffstat (limited to 'OpenSim/Services/Connectors/Land/LandServiceConnector.cs')
| -rw-r--r-- | OpenSim/Services/Connectors/Land/LandServiceConnector.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs index 4b25ac8..252f7a1 100644 --- a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs +++ b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs | |||
| @@ -64,7 +64,7 @@ namespace OpenSim.Services.Connectors | |||
| 64 | m_GridService = gridServices; | 64 | m_GridService = gridServices; |
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | public virtual LandData GetLandData(ulong regionHandle, uint x, uint y, out byte regionAccess) | 67 | public virtual LandData GetLandData(UUID scopeID, ulong regionHandle, uint x, uint y, out byte regionAccess) |
| 68 | { | 68 | { |
| 69 | LandData landData = null; | 69 | LandData landData = null; |
| 70 | Hashtable hash = new Hashtable(); | 70 | Hashtable hash = new Hashtable(); |
| @@ -80,7 +80,7 @@ namespace OpenSim.Services.Connectors | |||
| 80 | { | 80 | { |
| 81 | uint xpos = 0, ypos = 0; | 81 | uint xpos = 0, ypos = 0; |
| 82 | Utils.LongToUInts(regionHandle, out xpos, out ypos); | 82 | Utils.LongToUInts(regionHandle, out xpos, out ypos); |
| 83 | GridRegion info = m_GridService.GetRegionByPosition(UUID.Zero, (int)xpos, (int)ypos); | 83 | GridRegion info = m_GridService.GetRegionByPosition(scopeID, (int)xpos, (int)ypos); |
| 84 | if (info != null) // just to be sure | 84 | if (info != null) // just to be sure |
| 85 | { | 85 | { |
| 86 | XmlRpcRequest request = new XmlRpcRequest("land_data", paramList); | 86 | XmlRpcRequest request = new XmlRpcRequest("land_data", paramList); |