4 files changed, 28 insertions, 26 deletions

diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 878b0cc..fad4741 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -62,7 +62,12 @@ namespace OpenSim.Region.Capabilities
         private string m_httpListenerHostName;
         private uint m_httpListenPort;
 
-        private string m_capsObjectPath = "00001-";
+        /// <summary>
+        /// This is the uuid portion of every CAPS path.  It is used to make capability urls private to the requester.
+        /// </summary>
+        private string m_capsObjectPath;        
+        public string CapsObjectPath { get { return m_capsObjectPath; } }
+        
         private string m_requestPath = "0000/";
         private string m_mapLayerPath = "0001/";
         private string m_newInventory = "0002/";
@@ -109,9 +114,12 @@ namespace OpenSim.Region.Capabilities
             
             try
             {
+                m_httpListener.RemoveStreamHandler("POST", capsBase + m_mapLayerPath);
                 m_httpListener.AddStreamHandler(
                     new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", capsBase + m_mapLayerPath,
                                                                                 GetMapLayer));
+                
+                m_httpListener.RemoveStreamHandler("POST", capsBase + m_newInventory);                
                 m_httpListener.AddStreamHandler(
                     new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST",
                                                                                            capsBase + m_newInventory,
@@ -142,6 +150,7 @@ namespace OpenSim.Region.Capabilities
         private void AddLegacyCapsHandler(BaseHttpServer httpListener, string path, RestMethod restMethod)
         {
             string capsBase = "/CAPS/" + m_capsObjectPath;
+            httpListener.RemoveStreamHandler("POST", capsBase + path); 
             httpListener.AddStreamHandler(new RestStreamHandler("POST", capsBase + path, restMethod));
         }
 
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 869ca60..cdf6257 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -63,5 +63,7 @@ namespace OpenSim.Framework
         RegionStatus Region_Status { get; set; }
 
         ClientManager ClientManager { get; }
+        
+        string GetCapsPath(LLUUID agentId);       
     }
 }
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 0fb8314..0f6d79b 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -70,13 +70,22 @@ namespace OpenSim.Framework.Servers
             m_port = port;
         }
 
+        /// <summary>
+        /// Add a stream handler to the http server.  If the handler already exists, then nothing happens.
+        /// </summary>
+        /// <param name="handler"></param>
         public void AddStreamHandler(IRequestHandler handler)
         {
             string httpMethod = handler.HttpMethod;
             string path = handler.Path;
 
             string handlerKey = GetHandlerKey(httpMethod, path);
-            m_streamHandlers.Add(handlerKey, handler);
+                                    
+            if (!m_streamHandlers.ContainsKey(handlerKey))
+            {
+                //m_log.DebugFormat("[BASE HTTP SERVER]: Adding handler key {0}", handlerKey);                
+                m_streamHandlers.Add(handlerKey, handler);
+            }
         }
 
         private static string GetHandlerKey(string httpMethod, string path)
@@ -289,7 +298,7 @@ namespace OpenSim.Framework.Servers
                 }
                 else
                 {
-                    System.Console.WriteLine("Handler not found for http request " + request.RawUrl);
+                    m_log.ErrorFormat("[BASE HTTP SERVER] Handler not found for http request {0}", request.RawUrl);
                     responseString = "Error";
                 }
             }
@@ -589,7 +598,11 @@ namespace OpenSim.Framework.Servers
 
         public void RemoveStreamHandler(string httpMethod, string path)
         {
-            m_streamHandlers.Remove(GetHandlerKey(httpMethod, path));
+            string handlerKey = GetHandlerKey(httpMethod, path);            
+            
+            //m_log.DebugFormat("[BASE HTTP SERVER]: Removing handler key {0}", handlerKey);
+            
+            m_streamHandlers.Remove(handlerKey);
         }
 
         public void RemoveHTTPHandler(string httpMethod, string path)
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index e16d15e..6c95c88 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -45,7 +45,6 @@ namespace OpenSim.Framework
         private static Random randomClass = new Random();
         private static uint nextXferID = 5000;
         private static object XferLock = new object();
-        private static Dictionary<LLUUID, string> capsURLS = new Dictionary<LLUUID, string>();
 
         // Get a list of invalid path characters (OS dependent)
         private static string regexInvalidPathChars = "[" + new String(Path.GetInvalidPathChars()) + "]";
@@ -422,27 +421,6 @@ namespace OpenSim.Framework
             return ".";
         }
 
-        public static string GetCapsURL(LLUUID userID)
-        {
-            if (capsURLS.ContainsKey(userID))
-            {
-                return capsURLS[userID];
-            }
-            return String.Empty;
-        }
-
-        public static void SetCapsURL(LLUUID userID, string url)
-        {
-            if (capsURLS.ContainsKey(userID))
-            {
-                capsURLS[userID] = url;
-            }
-            else
-            {
-                capsURLS.Add(userID, url);
-            }
-        }
-
         // Nini (config) related Methods
         public static IConfigSource ConvertDataRowToXMLConfig(DataRow row, string fileName)
         {