From 4639409dbe0a05136f61fba773b84666c99b2264 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 7 Dec 2016 21:30:36 +0000 Subject: [PATCH 1/2] change caps Sethome fail error report --- .../Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 032104d398..6873325893 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs @@ -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; } From 18ff3eb2271ed2f58da35a83835b5d679a9ce33b Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 8 Dec 2016 23:56:14 +0000 Subject: [PATCH 2/2] JsonRpc: don't try to connect to a empty uri --- OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs index 2fe1a7d8bc..f3faf4f6d4 100644 --- a/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs @@ -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));