diff options
| author | Melanie | 2010-12-21 20:56:37 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-21 20:56:37 +0000 |
| commit | b1180a53dd8b73b817a9b5066942d8ae0a706f12 (patch) | |
| tree | a085b4b8551da3067bf5e0f2604c2fd91379c33e /OpenSim/Framework/Servers | |
| parent | Restore CM loking after core extract (diff) | |
| parent | Fix up merge artifacts (diff) | |
| download | opensim-SC_OLD-b1180a53dd8b73b817a9b5066942d8ae0a706f12.zip opensim-SC_OLD-b1180a53dd8b73b817a9b5066942d8ae0a706f12.tar.gz opensim-SC_OLD-b1180a53dd8b73b817a9b5066942d8ae0a706f12.tar.bz2 opensim-SC_OLD-b1180a53dd8b73b817a9b5066942d8ae0a706f12.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Servers')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs index 86fa44d..bae4e1b 100644 --- a/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs +++ b/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs | |||
| @@ -53,8 +53,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 53 | 53 | ||
| 54 | private static byte[] ReadFully(Stream stream) | 54 | private static byte[] ReadFully(Stream stream) |
| 55 | { | 55 | { |
| 56 | byte[] buffer = new byte[32768]; | 56 | byte[] buffer = new byte[1024]; |
| 57 | using (MemoryStream ms = new MemoryStream()) | 57 | using (MemoryStream ms = new MemoryStream(1024*256)) |
| 58 | { | 58 | { |
| 59 | while (true) | 59 | while (true) |
| 60 | { | 60 | { |