diff options
author | Mic Bowman | 2013-02-08 12:00:16 -0800 |
---|---|---|
committer | Mic Bowman | 2013-02-08 12:00:16 -0800 |
commit | 2b5eba9c7438ef0175c91c1910ce2d660d930fed (patch) | |
tree | ca42613ad287c72046c14b58d8ca05455da2ff85 /OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs | |
parent | If a component of a coalesced object fails to deserialization, do not add a n... (diff) | |
download | opensim-SC_OLD-2b5eba9c7438ef0175c91c1910ce2d660d930fed.zip opensim-SC_OLD-2b5eba9c7438ef0175c91c1910ce2d660d930fed.tar.gz opensim-SC_OLD-2b5eba9c7438ef0175c91c1910ce2d660d930fed.tar.bz2 opensim-SC_OLD-2b5eba9c7438ef0175c91c1910ce2d660d930fed.tar.xz |
Fix the return values for JsonDestroyStore, JsonRemoveValue, and JsonSetValue.
Fix the link message status when reading a notecard.
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs index 3b52e44..3249aa3 100644 --- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs | |||
@@ -239,7 +239,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore | |||
239 | if (! m_enabled) return false; | 239 | if (! m_enabled) return false; |
240 | 240 | ||
241 | lock (m_JsonValueStore) | 241 | lock (m_JsonValueStore) |
242 | m_JsonValueStore.Remove(storeID); | 242 | return m_JsonValueStore.Remove(storeID); |
243 | 243 | ||
244 | return true; | 244 | return true; |
245 | } | 245 | } |
@@ -311,8 +311,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore | |||
311 | try | 311 | try |
312 | { | 312 | { |
313 | lock (map) | 313 | lock (map) |
314 | if (map.SetValue(path,value,useJson)) | 314 | return map.SetValue(path,value,useJson); |
315 | return true; | ||
316 | } | 315 | } |
317 | catch (Exception e) | 316 | catch (Exception e) |
318 | { | 317 | { |
@@ -344,8 +343,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore | |||
344 | try | 343 | try |
345 | { | 344 | { |
346 | lock (map) | 345 | lock (map) |
347 | if (map.RemoveValue(path)) | 346 | return map.RemoveValue(path); |
348 | return true; | ||
349 | } | 347 | } |
350 | catch (Exception e) | 348 | catch (Exception e) |
351 | { | 349 | { |