diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs | |
parent | bad merge? (diff) | |
download | opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs index 19de3cf..b494aa4 100644 --- a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs +++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs | |||
@@ -64,13 +64,15 @@ namespace OpenSim.Capabilities.Handlers | |||
64 | 64 | ||
65 | string rurl = serverConfig.GetString("GetMeshRedirectURL"); | 65 | string rurl = serverConfig.GetString("GetMeshRedirectURL"); |
66 | 66 | ||
67 | server.AddStreamHandler( | 67 | GetMeshHandler gmeshHandler = new GetMeshHandler(m_AssetService); |
68 | new GetTextureHandler("/CAPS/GetMesh/" /*+ UUID.Random() */, m_AssetService, "GetMesh", null, rurl)); | 68 | IRequestHandler reqHandler |
69 | 69 | = new RestHTTPHandler( | |
70 | rurl = serverConfig.GetString("GetMesh2RedirectURL"); | 70 | "GET", |
71 | 71 | "/CAPS/" + UUID.Random(), | |
72 | server.AddStreamHandler( | 72 | httpMethod => gmeshHandler.ProcessGetMesh(httpMethod, UUID.Zero, null), |
73 | new GetTextureHandler("/CAPS/GetMesh2/" /*+ UUID.Random() */, m_AssetService, "GetMesh2", null, rurl)); | 73 | "GetMesh", |
74 | null); | ||
75 | server.AddStreamHandler(reqHandler); ; | ||
74 | } | 76 | } |
75 | } | 77 | } |
76 | } \ No newline at end of file | 78 | } \ No newline at end of file |