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

... and a few more..

avinationmerge
UbitUmarov 2014-09-17 17:25:07 +01:00
parent 060984502e
commit ce8ea55f4e
1 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
View File

@ -1239,19 +1239,25 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
return false; return false;
} }
Stream rstream = webResponse.GetResponseStream();
OSDMap mret = new OSDMap(); OSDMap mret = new OSDMap();
try
using (Stream rstream = webResponse.GetResponseStream())
{ {
mret = (OSDMap)OSDParser.DeserializeJson(rstream); try
} {
catch (Exception e) mret = (OSDMap)OSDParser.DeserializeJson(rstream);
{ }
m_log.DebugFormat("[PROFILES]: JsonRpcRequest Error {0} - remote user with legacy profiles?", e.Message); catch (Exception e)
return false; {
m_log.DebugFormat("[PROFILES]: JsonRpcRequest Error {0} - remote user with legacy profiles?", e.Message);
if (webResponse != null)
webResponse.Close();
return false;
}
} }
if (webResponse != null)
webResponse.Close();
if (mret.ContainsKey("error")) if (mret.ContainsKey("error"))
return false; return false;
@ -1315,19 +1321,26 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
return false; return false;
} }
Stream rstream = webResponse.GetResponseStream();
OSDMap response = new OSDMap(); OSDMap response = new OSDMap();
try
using (Stream rstream = webResponse.GetResponseStream())
{ {
response = (OSDMap)OSDParser.DeserializeJson(rstream); try
} {
catch (Exception e) response = (OSDMap)OSDParser.DeserializeJson(rstream);
{ }
m_log.DebugFormat("[PROFILES]: JsonRpcRequest Error {0} - remote user with legacy profiles?", e.Message); catch (Exception e)
return false; {
m_log.DebugFormat("[PROFILES]: JsonRpcRequest Error {0} - remote user with legacy profiles?", e.Message);
if (webResponse != null)
webResponse.Close();
return false;
}
} }
if (webResponse != null)
webResponse.Close();
if(response.ContainsKey("error")) if(response.ContainsKey("error"))
{ {
data = response["error"]; data = response["error"];