diff options
| author | Teravus Ovares (Dan Olivares) | 2010-10-09 12:07:58 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2010-10-09 12:07:58 -0400 |
| commit | 3454dfbcb3f76375ad5d98249a3cde27e5e5b250 (patch) | |
| tree | 1f2579a05e509fdd5cd084d802a1ba69e816584a /OpenSim/Region/CoreModules/Avatar/Assets | |
| parent | Return error code instead of the last byte of the file if range is not satisf... (diff) | |
| download | opensim-SC-3454dfbcb3f76375ad5d98249a3cde27e5e5b250.zip opensim-SC-3454dfbcb3f76375ad5d98249a3cde27e5e5b250.tar.gz opensim-SC-3454dfbcb3f76375ad5d98249a3cde27e5e5b250.tar.bz2 opensim-SC-3454dfbcb3f76375ad5d98249a3cde27e5e5b250.tar.xz | |
weird line endings fix commit
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Assets')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs index 6545be7..38151b1 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs | |||
| @@ -186,13 +186,13 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | |||
| 186 | // Range request | 186 | // Range request |
| 187 | int start, end; | 187 | int start, end; |
| 188 | if (TryParseRange(range, out start, out end)) | 188 | if (TryParseRange(range, out start, out end)) |
| 189 | { | 189 | { |
| 190 | // Before clamping end make sure we can satisfy it in order to avoid | 190 | // Before clamping end make sure we can satisfy it in order to avoid |
| 191 | // sending back the last byte instead of an error status | 191 | // sending back the last byte instead of an error status |
| 192 | if (end >= texture.Data.Length) | 192 | if (end >= texture.Data.Length) |
| 193 | { | 193 | { |
| 194 | response.StatusCode = (int)System.Net.HttpStatusCode.RequestedRangeNotSatisfiable; | 194 | response.StatusCode = (int)System.Net.HttpStatusCode.RequestedRangeNotSatisfiable; |
| 195 | return; | 195 | return; |
| 196 | } | 196 | } |
| 197 | 197 | ||
| 198 | end = Utils.Clamp(end, 0, texture.Data.Length - 1); | 198 | end = Utils.Clamp(end, 0, texture.Data.Length - 1); |