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

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

varregion
Justin Clark-Casey (justincc) 2013-09-03 00:06:50 +01:00
parent 4035badd20 9643915093
commit fc9f50d940
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1212,7 +1212,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
json.Add("jsonrpc", OSD.FromString("2.0")); json.Add("jsonrpc", OSD.FromString("2.0"));
json.Add("id", OSD.FromString(jsonId)); json.Add("id", OSD.FromString(jsonId));
json.Add("method", OSD.FromString(method)); json.Add("method", OSD.FromString(method));
// Experiment
json.Add("params", OSD.SerializeMembers(parameters)); json.Add("params", OSD.SerializeMembers(parameters));
string jsonRequestData = OSDParser.SerializeJsonString(json); string jsonRequestData = OSDParser.SerializeJsonString(json);
@ -1240,8 +1240,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
} }
Stream rstream = webResponse.GetResponseStream(); Stream rstream = webResponse.GetResponseStream();
if (rstream.Length < 1)
return false;
OSDMap mret = new OSDMap(); OSDMap mret = new OSDMap();
try try
@ -1318,8 +1316,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
} }
Stream rstream = webResponse.GetResponseStream(); Stream rstream = webResponse.GetResponseStream();
if (rstream.Length < 1)
return false;
OSDMap response = new OSDMap(); OSDMap response = new OSDMap();
try try