diff options
| author | Melanie | 2010-09-05 16:45:24 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-05 16:45:24 +0100 |
| commit | 09c75b30f361cbcdd0123f0e65b24f031a9bdeae (patch) | |
| tree | 52cf8ae07ded1ea0becc37cfdf67c9d866f34b9e /OpenSim/Framework | |
| parent | Remove "Dwell" support from core and replace it with calls to methods (diff) | |
| download | opensim-SC_OLD-09c75b30f361cbcdd0123f0e65b24f031a9bdeae.zip opensim-SC_OLD-09c75b30f361cbcdd0123f0e65b24f031a9bdeae.tar.gz opensim-SC_OLD-09c75b30f361cbcdd0123f0e65b24f031a9bdeae.tar.bz2 opensim-SC_OLD-09c75b30f361cbcdd0123f0e65b24f031a9bdeae.tar.xz | |
Fix build break
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs index 0135a6c..41ece86 100644 --- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs +++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs | |||
| @@ -94,11 +94,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 94 | 94 | ||
| 95 | try | 95 | try |
| 96 | { | 96 | { |
| 97 | <<<<<<< HEAD:OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs | ||
| 98 | if (resp.ContentLength > 0) | ||
| 99 | ======= | ||
| 100 | using (WebResponse resp = request.GetResponse()) | 97 | using (WebResponse resp = request.GetResponse()) |
| 101 | >>>>>>> e593607... Remove "Dwell" support from core and replace it with calls to methods:OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs | ||
| 102 | { | 98 | { |
| 103 | if (resp.ContentLength != 0) | 99 | if (resp.ContentLength != 0) |
| 104 | { | 100 | { |