aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs
diff options
context:
space:
mode:
authorDiva Canto2015-10-14 14:41:28 -0700
committerDiva Canto2015-10-14 14:41:28 -0700
commit721db9418fe1b0164a8a9f0195f1a187dd416d39 (patch)
tree37765e9d6b0e3e6fde461194026465329538e7a3 /OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs
parentFixed exception upon shutting down in plain ODE. (diff)
downloadopensim-SC-721db9418fe1b0164a8a9f0195f1a187dd416d39.zip
opensim-SC-721db9418fe1b0164a8a9f0195f1a187dd416d39.tar.gz
opensim-SC-721db9418fe1b0164a8a9f0195f1a187dd416d39.tar.bz2
opensim-SC-721db9418fe1b0164a8a9f0195f1a187dd416d39.tar.xz
Fixed Robust-bound GetTexture handler that had been knocked off with the new sim-bound handler that uses a Poll service. Rather than hammering both handlers into one single class, I'm splitting them into 2 classes, because they are considerably different.
Diffstat (limited to 'OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs')
-rw-r--r--OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs
index 3f6d162..479cebb 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework.Servers.HttpServer;
33using OpenSim.Server.Handlers.Base; 33using OpenSim.Server.Handlers.Base;
34using OpenMetaverse; 34using OpenMetaverse;
35 35
36/* 36
37namespace OpenSim.Capabilities.Handlers 37namespace OpenSim.Capabilities.Handlers
38{ 38{
39 public class GetTextureServerConnector : ServiceConnector 39 public class GetTextureServerConnector : ServiceConnector
@@ -66,8 +66,8 @@ namespace OpenSim.Capabilities.Handlers
66 string rurl = serverConfig.GetString("GetTextureRedirectURL"); 66 string rurl = serverConfig.GetString("GetTextureRedirectURL");
67 ; 67 ;
68 server.AddStreamHandler( 68 server.AddStreamHandler(
69 new GetTextureHandler("/CAPS/GetTexture/" */ /*+ UUID.Random() */ /*, m_AssetService, "GetTexture", null, rurl)); 69 new GetTextureRobustHandler("/CAPS/GetTexture/", m_AssetService, "GetTexture", null, rurl));
70 } 70 }
71 } 71 }
72} 72}
73*/ 73