diff options
| author | Melanie | 2012-03-14 11:33:51 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-14 11:33:51 +0000 |
| commit | c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d (patch) | |
| tree | 4b2972bdee4a29c4ecfce11bee9f154c7cdd9873 /OpenSim/Framework/MultipartForm.cs | |
| parent | Implement llSetPrimitiveParams for physics shape and material. Add (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.zip opensim-SC-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.tar.gz opensim-SC-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.tar.bz2 opensim-SC-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/MultipartForm.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/MultipartForm.cs b/OpenSim/Framework/MultipartForm.cs index 90c4007..7a13e8b 100644 --- a/OpenSim/Framework/MultipartForm.cs +++ b/OpenSim/Framework/MultipartForm.cs | |||
| @@ -119,7 +119,7 @@ namespace OpenSim.Framework | |||
| 119 | // Copy the temporary stream to the network stream | 119 | // Copy the temporary stream to the network stream |
| 120 | formDataStream.Seek(0, SeekOrigin.Begin); | 120 | formDataStream.Seek(0, SeekOrigin.Begin); |
| 121 | using (Stream requestStream = request.GetRequestStream()) | 121 | using (Stream requestStream = request.GetRequestStream()) |
| 122 | formDataStream.CopyTo(requestStream, (int)formDataStream.Length); | 122 | formDataStream.CopyStream(requestStream, (int)formDataStream.Length); |
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | #endregion Stream Writing | 125 | #endregion Stream Writing |