Merge branch 'master' into careminster

Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
author: Melanie 2012-05-05 10:32:04 +0100
committer: Melanie 2012-05-05 10:32:04 +0100
commit: 31ab8b2fe0683cbc9fa4503c616722d678b66e33 (patch)
tree: 34fefd4bf9db7eea797db49e75aaaac5080ea94b /OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
parent: Merge branch 'avination' (diff)
parent: Fire the scripting changed event with CHANGED_OWNER when an object that has c... (diff)
download: opensim-SC_OLD-31ab8b2fe0683cbc9fa4503c616722d678b66e33.zip
opensim-SC_OLD-31ab8b2fe0683cbc9fa4503c616722d678b66e33.tar.gz
opensim-SC_OLD-31ab8b2fe0683cbc9fa4503c616722d678b66e33.tar.bz2
opensim-SC_OLD-31ab8b2fe0683cbc9fa4503c616722d678b66e33.tar.xz
1 files changed, 19 insertions, 14 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 06d5587..2fa0b3f 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1392,21 +1392,26 @@ namespace OpenSim.Region.CoreModules.World.Land
        private void EventManagerOnRegisterCaps(UUID agentID, Caps caps)
        {
            string capsBase = "/CAPS/" + caps.CapsObjectPath;
-            caps.RegisterHandler("RemoteParcelRequest",
+            caps.RegisterHandler(
-                                 new RestStreamHandler("POST", capsBase + remoteParcelRequestPath,
+                "RemoteParcelRequest",
-                                                       delegate(string request, string path, string param,
+                new RestStreamHandler(
-                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+                    "POST",
-                                                           {
+                    capsBase + remoteParcelRequestPath,
-                                                               return RemoteParcelRequest(request, path, param, agentID, caps);
+                    (request, path, param, httpRequest, httpResponse)
-                                                           }));
+                        => RemoteParcelRequest(request, path, param, agentID, caps),
+                    "RemoteParcelRequest",
+                    agentID.ToString()));
            UUID parcelCapID = UUID.Random();
-            caps.RegisterHandler("ParcelPropertiesUpdate",
+            caps.RegisterHandler(
-                                 new RestStreamHandler("POST", "/CAPS/" + parcelCapID,
+                "ParcelPropertiesUpdate",
-                                                       delegate(string request, string path, string param,
+                new RestStreamHandler(
-                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+                    "POST",
-                                                           {
+                    "/CAPS/" + parcelCapID,
-                                                               return ProcessPropertiesUpdate(request, path, param, agentID, caps);
+                        (request, path, param, httpRequest, httpResponse)
-                                                           }));
+                            => ProcessPropertiesUpdate(request, path, param, agentID, caps),
+                    "ParcelPropertiesUpdate",
+                    agentID.ToString()));
        }
        private string ProcessPropertiesUpdate(string request, string path, string param, UUID agentID, Caps caps)
        {
author	Melanie	2012-05-05 10:32:04 +0100
committer	Melanie	2012-05-05 10:32:04 +0100
commit	31ab8b2fe0683cbc9fa4503c616722d678b66e33 (patch)
tree	34fefd4bf9db7eea797db49e75aaaac5080ea94b /OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
parent	Merge branch 'avination' (diff)
parent	Fire the scripting changed event with CHANGED_OWNER when an object that has c... (diff)
download	opensim-SC_OLD-31ab8b2fe0683cbc9fa4503c616722d678b66e33.zip opensim-SC_OLD-31ab8b2fe0683cbc9fa4503c616722d678b66e33.tar.gz opensim-SC_OLD-31ab8b2fe0683cbc9fa4503c616722d678b66e33.tar.bz2 opensim-SC_OLD-31ab8b2fe0683cbc9fa4503c616722d678b66e33.tar.xz

diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 06d5587..2fa0b3f 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1392,21 +1392,26 @@ namespace OpenSim.Region.CoreModules.World.Land
1392	private void EventManagerOnRegisterCaps(UUID agentID, Caps caps)	1392	private void EventManagerOnRegisterCaps(UUID agentID, Caps caps)
1393	{	1393	{
1394	string capsBase = "/CAPS/" + caps.CapsObjectPath;	1394	string capsBase = "/CAPS/" + caps.CapsObjectPath;
1395	caps.RegisterHandler("RemoteParcelRequest",	1395	caps.RegisterHandler(
1396	new RestStreamHandler("POST", capsBase + remoteParcelRequestPath,	1396	"RemoteParcelRequest",
1397	delegate(string request, string path, string param,	1397	new RestStreamHandler(
1398	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)	1398	"POST",
1399	{	1399	capsBase + remoteParcelRequestPath,
1400	return RemoteParcelRequest(request, path, param, agentID, caps);	1400	(request, path, param, httpRequest, httpResponse)
1401	}));	1401	=> RemoteParcelRequest(request, path, param, agentID, caps),
		1402	"RemoteParcelRequest",
		1403	agentID.ToString()));
		1404
1402	UUID parcelCapID = UUID.Random();	1405	UUID parcelCapID = UUID.Random();
1403	caps.RegisterHandler("ParcelPropertiesUpdate",	1406	caps.RegisterHandler(
1404	new RestStreamHandler("POST", "/CAPS/" + parcelCapID,	1407	"ParcelPropertiesUpdate",
1405	delegate(string request, string path, string param,	1408	new RestStreamHandler(
1406	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)	1409	"POST",
1407	{	1410	"/CAPS/" + parcelCapID,
1408	return ProcessPropertiesUpdate(request, path, param, agentID, caps);	1411	(request, path, param, httpRequest, httpResponse)
1409	}));	1412	=> ProcessPropertiesUpdate(request, path, param, agentID, caps),
		1413	"ParcelPropertiesUpdate",
		1414	agentID.ToString()));
1410	}	1415	}
1411	private string ProcessPropertiesUpdate(string request, string path, string param, UUID agentID, Caps caps)	1416	private string ProcessPropertiesUpdate(string request, string path, string param, UUID agentID, Caps caps)
1412	{	1417	{