From 8e542cfa03f9368368a0f73fbcff0d54622b5588 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 6 Dec 2011 21:42:56 +0000
Subject: Stop accidentally setting up the UploadTexture caps handler with the
 same url for all users

This meant that if a user exited the region, the UploadTexture handler would be effectively removed for everyone, causing subsequent failures.
This hopefully resolves the recent UploadTexture LLSD problems
This was a regression in 5640f2e (Thu Dec 1 23:24:15 2011 +0000)
---
 OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/ClientStack/Linden/Caps')

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index e61815f..45d6071 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 "UploadBakedTexture",
                 new RestStreamHandler(
                     "POST",
-                    "/CAPS/" + m_uploadBakedTexturePath,
+                    "/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath,
                     new UploadBakedTextureHandler(
                         caps, m_scene.AssetService, m_persistBakedTextures).UploadBakedTexture));
         }
-- 
cgit v1.1


From e6272b8d56dd7856faf374e7ac29460b4e74f1bb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 7 Dec 2011 12:28:42 +0000
Subject: Stop also adding an ordinary http handler when we set up a poll http
 handler.

It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
---
 .../ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs       | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'OpenSim/Region/ClientStack/Linden/Caps')

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 9f27abc..8ba6f61 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -361,7 +361,6 @@ namespace OpenSim.Region.ClientStack.Linden
             // This will persist this beyond the expiry of the caps handlers
             MainServer.Instance.AddPollServiceHTTPHandler(
                 capsBase + EventQueueGetUUID.ToString() + "/",
-                EventQueuePoll,
                 new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID));
 
             Random rnd = new Random(Environment.TickCount);
@@ -578,11 +577,6 @@ namespace OpenSim.Region.ClientStack.Linden
 //            return responsedata;
 //        }
 
-        public Hashtable EventQueuePoll(Hashtable request)
-        {
-            return new Hashtable();
-        }
-
 //        public Hashtable EventQueuePath2(Hashtable request)
 //        {
 //            string capuuid = (string)request["uri"]; //path.Replace("/CAPS/EQG/","");
-- 
cgit v1.1