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/GetTexture | |
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/GetTexture/GetTextureHandler.cs | 3 | ||||
-rw-r--r-- | OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs index a8e0fb5..59d8b9a 100644 --- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | |||
@@ -63,9 +63,6 @@ namespace OpenSim.Capabilities.Handlers | |||
63 | public GetTextureHandler(IAssetService assService) | 63 | public GetTextureHandler(IAssetService assService) |
64 | { | 64 | { |
65 | m_assetService = assService; | 65 | m_assetService = assService; |
66 | m_RedirectURL = redirectURL; | ||
67 | if (m_RedirectURL != null && !m_RedirectURL.EndsWith("/")) | ||
68 | m_RedirectURL += "/"; | ||
69 | } | 66 | } |
70 | 67 | ||
71 | public Hashtable Handle(Hashtable request) | 68 | public Hashtable Handle(Hashtable request) |
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs index d55e0ff..3f6d162 100644 --- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs +++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs | |||
@@ -66,7 +66,7 @@ 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 GetTextureHandler("/CAPS/GetTexture/" */ /*+ UUID.Random() */ /*, m_AssetService, "GetTexture", null, rurl)); |
70 | } | 70 | } |
71 | } | 71 | } |
72 | } | 72 | } |