aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorBrian McBee2007-08-08 07:00:56 +0000
committerBrian McBee2007-08-08 07:00:56 +0000
commit5061a703eafedaaec01b756ac0fd3ac5ea51d3c5 (patch)
tree8354544ede19f75229469855a5ded4e9c662a215 /OpenSim/Framework
parentWhoops! left this out. second part of r1541 (diff)
downloadopensim-SC_OLD-5061a703eafedaaec01b756ac0fd3ac5ea51d3c5.zip
opensim-SC_OLD-5061a703eafedaaec01b756ac0fd3ac5ea51d3c5.tar.gz
opensim-SC_OLD-5061a703eafedaaec01b756ac0fd3ac5ea51d3c5.tar.bz2
opensim-SC_OLD-5061a703eafedaaec01b756ac0fd3ac5ea51d3c5.tar.xz
CAPS should now be working in standalone mode. Texture uploads will work even after you cross a region boundary.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs18
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
74 { 74 {
75 Console.WriteLine("registering CAPS handlers"); 75 Console.WriteLine("registering CAPS handlers");
76 string capsBase = "/CAPS/" + m_capsObjectPath; 76 string capsBase = "/CAPS/" + m_capsObjectPath;
77 try
78 {
79 httpListener.AddStreamHandler(new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", capsBase + m_mapLayerPath, this.GetMapLayer));
80 httpListener.AddStreamHandler(new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST", capsBase + m_newInventory, this.NewAgentInventoryRequest));
77 81
78 httpListener.AddStreamHandler(new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", capsBase + m_mapLayerPath, this.GetMapLayer )); 82 AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest);
79 httpListener.AddStreamHandler( new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST", capsBase + m_newInventory, this.NewAgentInventoryRequest)); 83 //AddLegacyCapsHandler(httpListener, m_requestTexture , RequestTexture);
80 84 AddLegacyCapsHandler(httpListener, m_notecardUpdatePath, NoteCardAgentInventory);
81 AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest); 85 }
82 //AddLegacyCapsHandler(httpListener, m_requestTexture , RequestTexture); 86 catch
83 AddLegacyCapsHandler(httpListener, m_notecardUpdatePath, NoteCardAgentInventory); 87 {
88 }
84 } 89 }
85 90
86 91
@@ -361,3 +366,4 @@ namespace OpenSim.Region.Capabilities
361 } 366 }
362} 367}
363 368
369