CAPS should now be working in standalone mode. Texture uploads will work even after you cross a region boundary.

1 files changed, 12 insertions, 6 deletions

diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index d133617..82ef08d 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -74,13 +74,18 @@ namespace OpenSim.Region.Capabilities
         {
             Console.WriteLine("registering CAPS handlers");
             string capsBase = "/CAPS/" + m_capsObjectPath;
+            try
+            {
+                httpListener.AddStreamHandler(new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", capsBase + m_mapLayerPath, this.GetMapLayer));
+                httpListener.AddStreamHandler(new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST", capsBase + m_newInventory, this.NewAgentInventoryRequest));
 
-            httpListener.AddStreamHandler(new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", capsBase + m_mapLayerPath, this.GetMapLayer ));
-            httpListener.AddStreamHandler( new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST", capsBase + m_newInventory, this.NewAgentInventoryRequest));
-
-            AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest);
-            //AddLegacyCapsHandler(httpListener, m_requestTexture , RequestTexture);
-            AddLegacyCapsHandler(httpListener, m_notecardUpdatePath, NoteCardAgentInventory);
+                AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest);
+                //AddLegacyCapsHandler(httpListener, m_requestTexture , RequestTexture);
+                AddLegacyCapsHandler(httpListener, m_notecardUpdatePath, NoteCardAgentInventory);
+            }
+            catch
+            {
+            }
         }
 
 
@@ -361,3 +366,4 @@ namespace OpenSim.Region.Capabilities
     }
 }
 
+