aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Land
diff options
context:
space:
mode:
authorMelanie2011-12-05 20:32:35 +0000
committerMelanie2011-12-05 20:32:35 +0000
commitbc17e2e9cf1361116f9082326f7630b8f0c862ba (patch)
treed0bc568f8b5eeb47ccd77c822e6941b0e150319c /OpenSim/Region/CoreModules/World/Land
parentAdd the proper result code as per the LL announcement for llTransferLindenDol... (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.zip
opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.gz
opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.bz2
opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.xz
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 474905a..7a236bc 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1393,7 +1393,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1393 caps.RegisterHandler("RemoteParcelRequest", 1393 caps.RegisterHandler("RemoteParcelRequest",
1394 new RestStreamHandler("POST", capsBase + remoteParcelRequestPath, 1394 new RestStreamHandler("POST", capsBase + remoteParcelRequestPath,
1395 delegate(string request, string path, string param, 1395 delegate(string request, string path, string param,
1396 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 1396 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
1397 { 1397 {
1398 return RemoteParcelRequest(request, path, param, agentID, caps); 1398 return RemoteParcelRequest(request, path, param, agentID, caps);
1399 })); 1399 }));
@@ -1401,7 +1401,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1401 caps.RegisterHandler("ParcelPropertiesUpdate", 1401 caps.RegisterHandler("ParcelPropertiesUpdate",
1402 new RestStreamHandler("POST", "/CAPS/" + parcelCapID, 1402 new RestStreamHandler("POST", "/CAPS/" + parcelCapID,
1403 delegate(string request, string path, string param, 1403 delegate(string request, string path, string param,
1404 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 1404 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
1405 { 1405 {
1406 return ProcessPropertiesUpdate(request, path, param, agentID, caps); 1406 return ProcessPropertiesUpdate(request, path, param, agentID, caps);
1407 })); 1407 }));