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

Merge branch 'master' into httptests

httptests
UbitUmarov 2016-12-09 04:50:07 +00:00
parent 30dccd57cd 18ff3eb227
commit 8114ff9d06
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs
View File

@ -77,6 +77,9 @@ namespace OpenSim.Framework.Servers.HttpServer
if (parameters == null) if (parameters == null)
throw new ArgumentNullException("parameters"); throw new ArgumentNullException("parameters");
if(string.IsNullOrWhiteSpace(uri))
return false;
OSDMap request = new OSDMap(); OSDMap request = new OSDMap();
request.Add("jsonrpc", OSD.FromString("2.0")); request.Add("jsonrpc", OSD.FromString("2.0"));
request.Add("id", OSD.FromString(jsonId)); request.Add("id", OSD.FromString(jsonId));

2
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@ -1675,7 +1675,7 @@ namespace OpenSim.Region.ClientStack.Linden
if(fail) if(fail)
{ {
if(client != null) if(client != null)
client.SendAlertMessage(message, "HomePositionSet"); client.SendAlertMessage(message);
response = OSDParser.SerializeLLSDXmlString(resp); response = OSDParser.SerializeLLSDXmlString(resp);
return response; return response;
} }