aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authordahlia2013-04-20 02:08:22 -0700
committerdahlia2013-04-20 02:08:22 -0700
commit233f76177997cbe12aa100a3511d45bc1e9ccc5f (patch)
tree9bcc04a28f46f5cd0dc741a92a2486283b393d33 /OpenSim/Region/OptionalModules
parentRenderMaterials POST Cap now return material entries when invoked with an OSD... (diff)
downloadopensim-SC_OLD-233f76177997cbe12aa100a3511d45bc1e9ccc5f.zip
opensim-SC_OLD-233f76177997cbe12aa100a3511d45bc1e9ccc5f.tar.gz
opensim-SC_OLD-233f76177997cbe12aa100a3511d45bc1e9ccc5f.tar.bz2
opensim-SC_OLD-233f76177997cbe12aa100a3511d45bc1e9ccc5f.tar.xz
handle PUT verb for RenderMaterials Cap
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 7002e66..4501dad 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -130,7 +130,11 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
130 // handler normally and then add a GET handler via MainServer 130 // handler normally and then add a GET handler via MainServer
131 131
132 IRequestHandler renderMaterialsGetHandler = new RestStreamHandler("GET", capsBase + "/", RenderMaterialsGetCap); 132 IRequestHandler renderMaterialsGetHandler = new RestStreamHandler("GET", capsBase + "/", RenderMaterialsGetCap);
133 MainServer.Instance.AddStreamHandler(renderMaterialsGetHandler); 133 MainServer.Instance.AddStreamHandler(renderMaterialsGetHandler);
134
135 // materials viewer seems to use either POST or PUT, so assign POST handler for PUT as well
136 IRequestHandler renderMaterialsPutHandler = new RestStreamHandler("PUT", capsBase + "/", RenderMaterialsPostCap);
137 MainServer.Instance.AddStreamHandler(renderMaterialsPutHandler);
134 } 138 }
135 139
136 public void RemoveRegion(Scene scene) 140 public void RemoveRegion(Scene scene)