aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-10-14 18:37:22 +0100
committerJustin Clark-Casey (justincc)2014-11-25 23:21:38 +0000
commit16a5e154436fc56235ac03846d4bb1ba4d21ac87 (patch)
tree19ed04e82bfa813519e7d55f70e575bfd5e4f585 /OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
parentStart JobEngine by default in simulator for now. (diff)
downloadopensim-SC_OLD-16a5e154436fc56235ac03846d4bb1ba4d21ac87.zip
opensim-SC_OLD-16a5e154436fc56235ac03846d4bb1ba4d21ac87.tar.gz
opensim-SC_OLD-16a5e154436fc56235ac03846d4bb1ba4d21ac87.tar.bz2
opensim-SC_OLD-16a5e154436fc56235ac03846d4bb1ba4d21ac87.tar.xz
Allow GetMesh capability to be served directly by a server like GetTexture
To do this required GetMesh to be converted to a BaseStreamHandler Unlike GetTexture connector, no redirect URL functionality yet (this wasn't present in the first place).
Diffstat (limited to '')
-rw-r--r--OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs11
1 files changed, 2 insertions, 9 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
index 8a275f3..9c53862 100644
--- a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
@@ -65,15 +65,8 @@ namespace OpenSim.Capabilities.Handlers
65 if (m_AssetService == null) 65 if (m_AssetService == null)
66 throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName)); 66 throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
67 67
68 GetMeshHandler gmeshHandler = new GetMeshHandler(m_AssetService); 68 server.AddStreamHandler(
69 IRequestHandler reqHandler 69 new GetMeshHandler("/CAPS/GetMesh/" /*+ UUID.Random() */, m_AssetService, "GetMesh", null));
70 = new RestHTTPHandler(
71 "GET",
72 "/CAPS/" + UUID.Random(),
73 httpMethod => gmeshHandler.ProcessGetMesh(httpMethod, UUID.Zero, null),
74 "GetMesh",
75 null);
76 server.AddStreamHandler(reqHandler);
77 } 70 }
78 } 71 }
79} \ No newline at end of file 72} \ No newline at end of file