OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix build break

viewer-2-initial-appearance
Melanie 2010-09-05 16:45:24 +01:00
parent 6a0a878f7c
commit 09c75b30f3
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
View File

@ -94,11 +94,7 @@ namespace OpenSim.Framework.Servers.HttpServer
try try
{ {
<<<<<<< HEAD:OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
if (resp.ContentLength > 0)
=======
using (WebResponse resp = request.GetResponse()) using (WebResponse resp = request.GetResponse())
>>>>>>> e593607... Remove "Dwell" support from core and replace it with calls to methods:OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
{ {
if (resp.ContentLength != 0) if (resp.ContentLength != 0)
{ {