diff options
author | Justin Clark-Casey (justincc) | 2011-12-09 22:32:28 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-12-09 22:32:28 +0000 |
commit | 4e9f50b878ae9d09e976ea7bc81f230ce9637cf4 (patch) | |
tree | d7824616139b501192b67914cc0d338147329180 /OpenSim/Capabilities/Handlers/GetTexture | |
parent | Revert "Revert "Stop performing the asset save part of baked texture uploadin... (diff) | |
download | opensim-SC-4e9f50b878ae9d09e976ea7bc81f230ce9637cf4.zip opensim-SC-4e9f50b878ae9d09e976ea7bc81f230ce9637cf4.tar.gz opensim-SC-4e9f50b878ae9d09e976ea7bc81f230ce9637cf4.tar.bz2 opensim-SC-4e9f50b878ae9d09e976ea7bc81f230ce9637cf4.tar.xz |
Add commented log lines to FetchInventoryDescendents2 path for future use.
Haven't been able to resolve issue where attachments are removed by the viewer on relog on a localhost
Diffstat (limited to 'OpenSim/Capabilities/Handlers/GetTexture')
-rw-r--r-- | OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs index ae95821..217217e 100644 --- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | |||
@@ -221,6 +221,7 @@ namespace OpenSim.Capabilities.Handlers | |||
221 | int start, end; | 221 | int start, end; |
222 | if (TryParseRange(range, out start, out end)) | 222 | if (TryParseRange(range, out start, out end)) |
223 | { | 223 | { |
224 | |||
224 | // Before clamping start make sure we can satisfy it in order to avoid | 225 | // Before clamping start make sure we can satisfy it in order to avoid |
225 | // sending back the last byte instead of an error status | 226 | // sending back the last byte instead of an error status |
226 | if (start >= texture.Data.Length) | 227 | if (start >= texture.Data.Length) |
@@ -266,9 +267,14 @@ namespace OpenSim.Capabilities.Handlers | |||
266 | response.Body.Write(texture.Data, 0, texture.Data.Length); | 267 | response.Body.Write(texture.Data, 0, texture.Data.Length); |
267 | } | 268 | } |
268 | 269 | ||
269 | // m_log.DebugFormat( | 270 | // if (response.StatusCode < 200 || response.StatusCode > 299) |
270 | // "[GETTEXTURE]: For texture {0} requested range {1} responded {2} with content length {3} (actual {4})", | 271 | // m_log.WarnFormat( |
271 | // texture.FullID, range, response.StatusCode, response.ContentLength, texture.Data.Length); | 272 | // "[GETTEXTURE]: For texture {0} requested range {1} responded {2} with content length {3} (actual {4})", |
273 | // texture.FullID, range, response.StatusCode, response.ContentLength, texture.Data.Length); | ||
274 | // else | ||
275 | // m_log.DebugFormat( | ||
276 | // "[GETTEXTURE]: For texture {0} requested range {1} responded {2} with content length {3} (actual {4})", | ||
277 | // texture.FullID, range, response.StatusCode, response.ContentLength, texture.Data.Length); | ||
272 | } | 278 | } |
273 | 279 | ||
274 | private bool TryParseRange(string header, out int start, out int end) | 280 | private bool TryParseRange(string header, out int start, out int end) |