diff options
| author | Diva Canto | 2013-07-09 14:13:51 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-09 14:13:51 -0700 |
| commit | d0dfb744b206d3bd002ed72f415f177c6b04226b (patch) | |
| tree | dba29f24667d254371abb726e2842700c189dfdf /OpenSim/Capabilities/Handlers/GetTexture | |
| parent | Put guards on a bunch of exception-inducing code, as seen in logs from load t... (diff) | |
| parent | BulletSim: add parameter to optionally disable vehicle linear deflection. (diff) | |
| download | opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.zip opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.gz opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.bz2 opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs index 9f3cc19..789bf2b 100644 --- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | |||
| @@ -64,7 +64,7 @@ namespace OpenSim.Capabilities.Handlers | |||
| 64 | m_assetService = assService; | 64 | m_assetService = assService; |
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 67 | protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 68 | { | 68 | { |
| 69 | // Try to parse the texture ID from the request URL | 69 | // Try to parse the texture ID from the request URL |
| 70 | NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query); | 70 | NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query); |