ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-04-27 00:27:05 +01:00
parent 06661708b4 6928ec0240
commit bbffe16f13
72 changed files with 6243 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,7 +81,7 @@ namespace OpenSim.Framework.Servers.HttpServer
}
catch (Exception e)
{
m_log.DebugFormat("[FORMS]: exception occured on sending request {0}", e.Message);
m_log.DebugFormat("[FORMS]: exception occured on sending request to {0}: {1}", requestUrl, e.Message);
}
finally
{

11
OpenSim/Framework/WebUtil.cs
View File

@@ -146,18 +146,23 @@ namespace OpenSim.Framework
{
using (Stream responseStream = response.GetResponseStream())
{
string responseStr = null;
try
{
string responseStr = responseStream.GetStreamString();
responseStr = responseStream.GetStreamString();
OSD responseOSD = OSDParser.Deserialize(responseStr);
if (responseOSD.Type == OSDType.Map)
return (OSDMap)responseOSD;
else
errorMessage = "Response format was invalid.";
}
catch
catch (Exception ex)
{
errorMessage = "Failed to parse the response.";
if (!String.IsNullOrEmpty(responseStr))
errorMessage = "Failed to parse the response:\n" + responseStr;
else
errorMessage = "Failed to retrieve the response: " + ex.Message;
}
}
}