aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2013-07-11 09:48:15 -0700
committerDiva Canto2013-07-11 09:48:15 -0700
commitea371a6f5480d128e3b0296519e205d3a899ae89 (patch)
tree1c8ba6a1b3fcf36731b2d721f7662bf0e083cb20 /OpenSim/Region
parentSwitched UUIDNameRequest and RegionHandleRequest to Sync, because now they ar... (diff)
parentremove names from Capability handlers (added by justincc in commit 013710168b... (diff)
downloadopensim-SC_OLD-ea371a6f5480d128e3b0296519e205d3a899ae89.zip
opensim-SC_OLD-ea371a6f5480d128e3b0296519e205d3a899ae89.tar.gz
opensim-SC_OLD-ea371a6f5480d128e3b0296519e205d3a899ae89.tar.bz2
opensim-SC_OLD-ea371a6f5480d128e3b0296519e205d3a899ae89.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs11
1 files changed, 4 insertions, 7 deletions
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 0a0d65c..088eb0f 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -139,21 +139,18 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
139 { 139 {
140 string capsBase = "/CAPS/" + caps.CapsObjectPath; 140 string capsBase = "/CAPS/" + caps.CapsObjectPath;
141 141
142 IRequestHandler renderMaterialsPostHandler 142 IRequestHandler renderMaterialsPostHandler = new RestStreamHandler("POST", capsBase + "/", RenderMaterialsPostCap);
143 = new RestStreamHandler("POST", capsBase + "/", RenderMaterialsPostCap, "RenderMaterialsPost", null); 143 caps.RegisterHandler("RenderMaterials", renderMaterialsPostHandler);
144 caps.RegisterHandler("RenderMaterialsPost", renderMaterialsPostHandler);
145 144
146 // OpenSimulator CAPs infrastructure seems to be somewhat hostile towards any CAP that requires both GET 145 // OpenSimulator CAPs infrastructure seems to be somewhat hostile towards any CAP that requires both GET
147 // and POST handlers, (at least at the time this was originally written), so we first set up a POST 146 // and POST handlers, (at least at the time this was originally written), so we first set up a POST
148 // handler normally and then add a GET handler via MainServer 147 // handler normally and then add a GET handler via MainServer
149 148
150 IRequestHandler renderMaterialsGetHandler 149 IRequestHandler renderMaterialsGetHandler = new RestStreamHandler("GET", capsBase + "/", RenderMaterialsGetCap);
151 = new RestStreamHandler("GET", capsBase + "/", RenderMaterialsGetCap, "RenderMaterialsGet", null);
152 MainServer.Instance.AddStreamHandler(renderMaterialsGetHandler); 150 MainServer.Instance.AddStreamHandler(renderMaterialsGetHandler);
153 151
154 // materials viewer seems to use either POST or PUT, so assign POST handler for PUT as well 152 // materials viewer seems to use either POST or PUT, so assign POST handler for PUT as well
155 IRequestHandler renderMaterialsPutHandler 153 IRequestHandler renderMaterialsPutHandler = new RestStreamHandler("PUT", capsBase + "/", RenderMaterialsPostCap);
156 = new RestStreamHandler("PUT", capsBase + "/", RenderMaterialsPostCap, "RenderMaterialsPut", null);
157 MainServer.Instance.AddStreamHandler(renderMaterialsPutHandler); 154 MainServer.Instance.AddStreamHandler(renderMaterialsPutHandler);
158 } 155 }
159 156