Merge branch 'master' into httptests

2 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs
index 2fe1a7d..f3faf4f 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));
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 032104d..6873325 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;
             }