aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorUbitUmarov2017-06-06 21:55:47 +0100
committerUbitUmarov2017-06-06 21:55:47 +0100
commit7d58b73bbcef148cdcd57b9a2796331c6497c397 (patch)
treea16386826709002a6b295234c0248a308b2af0d0 /OpenSim/Region/CoreModules
parentMerge branch 'master' into httptests (diff)
downloadopensim-SC-7d58b73bbcef148cdcd57b9a2796331c6497c397.zip
opensim-SC-7d58b73bbcef148cdcd57b9a2796331c6497c397.tar.gz
opensim-SC-7d58b73bbcef148cdcd57b9a2796331c6497c397.tar.bz2
opensim-SC-7d58b73bbcef148cdcd57b9a2796331c6497c397.tar.xz
some changes on pollevent
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs15
1 files changed, 6 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index a2c7c83..c7e58e5 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1719,26 +1719,23 @@ namespace OpenSim.Region.CoreModules.World.Land
1719 1719
1720 private void EventManagerOnRegisterCaps(UUID agentID, Caps caps) 1720 private void EventManagerOnRegisterCaps(UUID agentID, Caps caps)
1721 { 1721 {
1722 //string capsBase = "/CAPS/" + UUID.Random(); 1722 string cap = "/CAPS/" + UUID.Random();
1723 string capsBase = "/CAPS/" + caps.CapsObjectPath;
1724 caps.RegisterHandler( 1723 caps.RegisterHandler(
1725 "RemoteParcelRequest", 1724 "RemoteParcelRequest",
1726 new RestStreamHandler( 1725 new RestStreamHandler(
1727 "POST", 1726 "POST", cap,
1728 capsBase,
1729 (request, path, param, httpRequest, httpResponse) 1727 (request, path, param, httpRequest, httpResponse)
1730 => RemoteParcelRequest(request, path, param, agentID, caps), 1728 => RemoteParcelRequest(request, path, param, agentID, caps),
1731 "RemoteParcelRequest", 1729 "RemoteParcelRequest",
1732 agentID.ToString())); 1730 agentID.ToString()));
1733 1731
1734 UUID parcelCapID = UUID.Random(); 1732 cap = "/CAPS/" + UUID.Random();
1735 caps.RegisterHandler( 1733 caps.RegisterHandler(
1736 "ParcelPropertiesUpdate", 1734 "ParcelPropertiesUpdate",
1737 new RestStreamHandler( 1735 new RestStreamHandler(
1738 "POST", 1736 "POST", cap,
1739 "/CAPS/" + parcelCapID, 1737 (request, path, param, httpRequest, httpResponse)
1740 (request, path, param, httpRequest, httpResponse) 1738 => ProcessPropertiesUpdate(request, path, param, agentID, caps),
1741 => ProcessPropertiesUpdate(request, path, param, agentID, caps),
1742 "ParcelPropertiesUpdate", 1739 "ParcelPropertiesUpdate",
1743 agentID.ToString())); 1740 agentID.ToString()));
1744 } 1741 }