aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ILandObject.cs4
-rw-r--r--OpenSim/Framework/WebUtil.cs9
2 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
index 5a55b02..0316944 100644
--- a/OpenSim/Framework/ILandObject.cs
+++ b/OpenSim/Framework/ILandObject.cs
@@ -35,8 +35,8 @@ namespace OpenSim.Framework
35 35
36 public interface ILandObject 36 public interface ILandObject
37 { 37 {
38 int GetParcelMaxPrimCount(ILandObject thisObject); 38 int GetParcelMaxPrimCount();
39 int GetSimulatorMaxPrimCount(ILandObject thisObject); 39 int GetSimulatorMaxPrimCount();
40 int GetPrimsFree(); 40 int GetPrimsFree();
41 41
42 LandData LandData { get; set; } 42 LandData LandData { get; set; }
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 5211157..f8691dc 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -251,11 +251,11 @@ namespace OpenSim.Framework
251 // This just dumps a warning for any operation that takes more than 100 ms 251 // This just dumps a warning for any operation that takes more than 100 ms
252 int tickdiff = Util.EnvironmentTickCountSubtract(tickstart); 252 int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
253 if (tickdiff > LongCallTime) 253 if (tickdiff > LongCallTime)
254 m_log.InfoFormat("[WEB UTIL]: osd request <{0}> (URI:{1}, METHOD:{2}) took {3}ms overall, {4}ms writing", 254 m_log.DebugFormat("[WEB UTIL]: osd request <{0}> (URI:{1}, METHOD:{2}) took {3}ms overall, {4}ms writing",
255 reqnum,url,method,tickdiff,tickdata); 255 reqnum,url,method,tickdiff,tickdata);
256 } 256 }
257 257
258 m_log.WarnFormat("[WEB UTIL]: <{0}> osd request for {1}, method {2} FAILED: {3}", reqnum, url, method, errorMessage); 258 m_log.DebugFormat("[WEB UTIL]: <{0}> osd request for {1}, method {2} FAILED: {3}", reqnum, url, method, errorMessage);
259 return ErrorResponseMap(errorMessage); 259 return ErrorResponseMap(errorMessage);
260 } 260 }
261 261
@@ -986,8 +986,11 @@ namespace OpenSim.Framework
986 986
987 try 987 try
988 { 988 {
989 using (WebResponse resp = request.GetResponse()) 989 using (HttpWebResponse resp = (HttpWebResponse)request.GetResponse())
990 { 990 {
991 if (resp.StatusCode == HttpStatusCode.NotFound)
992 return deserial;
993
991 if (resp.ContentLength != 0) 994 if (resp.ContentLength != 0)
992 { 995 {
993 Stream respStream = resp.GetResponseStream(); 996 Stream respStream = resp.GetResponseStream();