Merge branch 'master' into httptests
commit
8114ff9d06
|
@ -77,6 +77,9 @@ namespace OpenSim.Framework.Servers.HttpServer
|
|||
if (parameters == null)
|
||||
throw new ArgumentNullException("parameters");
|
||||
|
||||
if(string.IsNullOrWhiteSpace(uri))
|
||||
return false;
|
||||
|
||||
OSDMap request = new OSDMap();
|
||||
request.Add("jsonrpc", OSD.FromString("2.0"));
|
||||
request.Add("id", OSD.FromString(jsonId));
|
||||
|
|
|
@ -1675,7 +1675,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
if(fail)
|
||||
{
|
||||
if(client != null)
|
||||
client.SendAlertMessage(message, "HomePositionSet");
|
||||
client.SendAlertMessage(message);
|
||||
response = OSDParser.SerializeLLSDXmlString(resp);
|
||||
return response;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue