aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities
diff options
context:
space:
mode:
authorUbitUmarov2017-06-14 22:05:53 +0100
committerUbitUmarov2017-06-14 22:05:53 +0100
commit1c64b5018ac93abf7ffc150fb66066041c9a0902 (patch)
treeab4a84b28cfca2e237af0a2daa177c6347ae9d67 /OpenSim/Capabilities
parent some cleanup.. remove some stats that only some do look at once on a lifetime (diff)
downloadopensim-SC-1c64b5018ac93abf7ffc150fb66066041c9a0902.zip
opensim-SC-1c64b5018ac93abf7ffc150fb66066041c9a0902.tar.gz
opensim-SC-1c64b5018ac93abf7ffc150fb66066041c9a0902.tar.bz2
opensim-SC-1c64b5018ac93abf7ffc150fb66066041c9a0902.tar.xz
fix llsd DeserialiseOSDMap cast from boolean to int, this seems to fix alchemy beta 5.0 scripts upload, but this viewer seems to be of no use for opensim, sice it does crash.. insists lbsa is at second life etc
Diffstat (limited to 'OpenSim/Capabilities')
-rw-r--r--OpenSim/Capabilities/LLSDHelpers.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Capabilities/LLSDHelpers.cs b/OpenSim/Capabilities/LLSDHelpers.cs
index 8f1a40e..d582267 100644
--- a/OpenSim/Capabilities/LLSDHelpers.cs
+++ b/OpenSim/Capabilities/LLSDHelpers.cs
@@ -157,6 +157,11 @@ namespace OpenSim.Framework.Capabilities
157 // the LLSD map/array types in the array need to be deserialised 157 // the LLSD map/array types in the array need to be deserialised
158 // but first we need to know the right class to deserialise them into. 158 // but first we need to know the right class to deserialise them into.
159 } 159 }
160 else if(enumerator.Value is Boolean && field.FieldType == typeof(int) )
161 {
162 int i = (bool)enumerator.Value ? 1 : 0;
163 field.SetValue(obj, (object)i);
164 }
160 else 165 else
161 { 166 {
162 field.SetValue(obj, enumerator.Value); 167 field.SetValue(obj, enumerator.Value);