diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs index 2fe1a7d..411ee31 100644 --- a/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
43 | public class JsonRpcRequestManager | 43 | public class JsonRpcRequestManager |
44 | { | 44 | { |
45 | static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | public JsonRpcRequestManager() | 47 | public JsonRpcRequestManager() |
48 | { | 48 | { |
49 | } | 49 | } |
@@ -77,6 +77,9 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
77 | if (parameters == null) | 77 | if (parameters == null) |
78 | throw new ArgumentNullException("parameters"); | 78 | throw new ArgumentNullException("parameters"); |
79 | 79 | ||
80 | if(string.IsNullOrWhiteSpace(uri)) | ||
81 | return false; | ||
82 | |||
80 | OSDMap request = new OSDMap(); | 83 | OSDMap request = new OSDMap(); |
81 | request.Add("jsonrpc", OSD.FromString("2.0")); | 84 | request.Add("jsonrpc", OSD.FromString("2.0")); |
82 | request.Add("id", OSD.FromString(jsonId)); | 85 | request.Add("id", OSD.FromString(jsonId)); |
@@ -185,6 +188,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
185 | 188 | ||
186 | return true; | 189 | return true; |
187 | } | 190 | } |
188 | 191 | ||
189 | } | 192 | } |
190 | } | 193 | } |