diff options
| author | UbitUmarov | 2016-09-03 07:51:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-09-03 07:51:53 +0100 |
| commit | 9aec227767cf726216514d0494f11b5d8bf5b807 (patch) | |
| tree | 8f308f4c1eefa19954fc30a560ac780f8a8e916a /OpenSim/Capabilities/LLSDStreamHandler.cs | |
| parent | merge issue (diff) | |
| parent | tests making sure evering thing is coerently wrong.. (diff) | |
| download | opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.zip opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.tar.gz opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.tar.bz2 opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Capabilities/LLSDStreamHandler.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Capabilities/LLSDStreamHandler.cs b/OpenSim/Capabilities/LLSDStreamHandler.cs index 4fa1153..4f1b10a 100644 --- a/OpenSim/Capabilities/LLSDStreamHandler.cs +++ b/OpenSim/Capabilities/LLSDStreamHandler.cs | |||
| @@ -61,6 +61,9 @@ namespace OpenSim.Framework.Capabilities | |||
| 61 | // OpenMetaverse.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request)); | 61 | // OpenMetaverse.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request)); |
| 62 | 62 | ||
| 63 | Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request); | 63 | Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request); |
| 64 | if(hash == null) | ||
| 65 | return new byte[0]; | ||
| 66 | |||
| 64 | TRequest llsdRequest = new TRequest(); | 67 | TRequest llsdRequest = new TRequest(); |
| 65 | LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest); | 68 | LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest); |
| 66 | 69 | ||