aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs')
-rw-r--r--OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs29
1 files changed, 13 insertions, 16 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
index 8a275f3..19de3cf 100644
--- a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
@@ -25,16 +25,13 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections;
30using Nini.Config; 28using Nini.Config;
31using OpenSim.Server.Base; 29using OpenMetaverse;
32using OpenSim.Services.Interfaces;
33using OpenSim.Framework.Servers.HttpServer; 30using OpenSim.Framework.Servers.HttpServer;
31using OpenSim.Server.Base;
34using OpenSim.Server.Handlers.Base; 32using OpenSim.Server.Handlers.Base;
35using OpenSim.Framework.Servers; 33using OpenSim.Services.Interfaces;
36 34using System;
37using OpenMetaverse;
38 35
39namespace OpenSim.Capabilities.Handlers 36namespace OpenSim.Capabilities.Handlers
40{ 37{
@@ -65,15 +62,15 @@ namespace OpenSim.Capabilities.Handlers
65 if (m_AssetService == null) 62 if (m_AssetService == null)
66 throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName)); 63 throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
67 64
68 GetMeshHandler gmeshHandler = new GetMeshHandler(m_AssetService); 65 string rurl = serverConfig.GetString("GetMeshRedirectURL");
69 IRequestHandler reqHandler 66
70 = new RestHTTPHandler( 67 server.AddStreamHandler(
71 "GET", 68 new GetTextureHandler("/CAPS/GetMesh/" /*+ UUID.Random() */, m_AssetService, "GetMesh", null, rurl));
72 "/CAPS/" + UUID.Random(), 69
73 httpMethod => gmeshHandler.ProcessGetMesh(httpMethod, UUID.Zero, null), 70 rurl = serverConfig.GetString("GetMesh2RedirectURL");
74 "GetMesh", 71
75 null); 72 server.AddStreamHandler(
76 server.AddStreamHandler(reqHandler); 73 new GetTextureHandler("/CAPS/GetMesh2/" /*+ UUID.Random() */, m_AssetService, "GetMesh2", null, rurl));
77 } 74 }
78 } 75 }
79} \ No newline at end of file 76} \ No newline at end of file