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/Server | |
| parent | Standardize the way WebRequests are made in the SimulationServiceConnector. A... (diff) | |
| parent | Add permissions hooks for object transfers (diff) | |
| download | opensim-SC_OLD-d3987024d776f08c4eabba4df8353971aa9466b8.zip opensim-SC_OLD-d3987024d776f08c4eabba4df8353971aa9466b8.tar.gz opensim-SC_OLD-d3987024d776f08c4eabba4df8353971aa9466b8.tar.bz2 opensim-SC_OLD-d3987024d776f08c4eabba4df8353971aa9466b8.tar.xz | |
Merge branch 'master' into cmickeyb
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Handlers/Land/LandHandlers.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Land/LandHandlers.cs b/OpenSim/Server/Handlers/Land/LandHandlers.cs index 561f285..b45289a 100644 --- a/OpenSim/Server/Handlers/Land/LandHandlers.cs +++ b/OpenSim/Server/Handlers/Land/LandHandlers.cs | |||
| @@ -67,7 +67,7 @@ namespace OpenSim.Server.Handlers.Land | |||
| 67 | m_log.DebugFormat("[LAND HANDLER]: Got request for land data at {0}, {1} for region {2}", x, y, regionHandle); | 67 | m_log.DebugFormat("[LAND HANDLER]: Got request for land data at {0}, {1} for region {2}", x, y, regionHandle); |
| 68 | 68 | ||
| 69 | byte regionAccess; | 69 | byte regionAccess; |
| 70 | LandData landData = m_LocalService.GetLandData(regionHandle, x, y, out regionAccess); | 70 | LandData landData = m_LocalService.GetLandData(UUID.Zero, regionHandle, x, y, out regionAccess); |
| 71 | Hashtable hash = new Hashtable(); | 71 | Hashtable hash = new Hashtable(); |
| 72 | if (landData != null) | 72 | if (landData != null) |
| 73 | { | 73 | { |