diff options
| author | Melanie | 2009-10-04 05:49:16 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-04 05:49:16 +0100 |
| commit | 6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6 (patch) | |
| tree | 7e786c0ce436f42a60806629f3249658eab4884a /OpenSim/Region/CoreModules/Agent | |
| parent | Slightly better message with status code for WebException. (diff) | |
| parent | Closing another stream. (diff) | |
| download | opensim-SC-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.zip opensim-SC-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.tar.gz opensim-SC-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.tar.bz2 opensim-SC-6878b26b0d3d9ba26b1afe097e193fb1bafbc9b6.tar.xz | |
Merge branch 'diva-textures-osgrid'
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent')
| -rw-r--r-- | OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs index a0f359b..7456e8c 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | |||
| @@ -257,7 +257,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender | |||
| 257 | stringResult.AppendFormat("{0}|{1}|{2}{3}", Layers[i].Start, Layers[i].End, Layers[i].End - Layers[i].Start, strEnd); | 257 | stringResult.AppendFormat("{0}|{1}|{2}{3}", Layers[i].Start, Layers[i].End, Layers[i].End - Layers[i].Start, strEnd); |
| 258 | } | 258 | } |
| 259 | 259 | ||
| 260 | layerDecodeAsset.Data = Encoding.UTF8.GetBytes(stringResult.ToString()); | 260 | layerDecodeAsset.Data = Util.UTF8.GetBytes(stringResult.ToString()); |
| 261 | 261 | ||
| 262 | #endregion Serialize Layer Data | 262 | #endregion Serialize Layer Data |
| 263 | 263 | ||
| @@ -280,7 +280,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender | |||
| 280 | { | 280 | { |
| 281 | #region Deserialize Layer Data | 281 | #region Deserialize Layer Data |
| 282 | 282 | ||
| 283 | string readResult = Encoding.UTF8.GetString(layerDecodeAsset.Data); | 283 | string readResult = Util.UTF8.GetString(layerDecodeAsset.Data); |
| 284 | string[] lines = readResult.Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries); | 284 | string[] lines = readResult.Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries); |
| 285 | 285 | ||
| 286 | if (lines.Length == 0) | 286 | if (lines.Length == 0) |