diff options
author | Oren Hurvitz | 2014-04-22 20:04:12 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-23 16:37:36 +0300 |
commit | 998d7009a65def0a4debc9369d35b63611db5b55 (patch) | |
tree | d1303dc0387ae9ce4ddb076d5ccc856f3d5844e0 /OpenSim/Region/OptionalModules/Scripting | |
parent | Workaround for SRAS: if Store Asset returns 'null' then assume the asset alre... (diff) | |
download | opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.zip opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.gz opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.bz2 opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.xz |
Eliminated many warnings
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs index e498c6a..c38bb3e 100644 --- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs +++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs | |||
@@ -276,7 +276,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore | |||
276 | { | 276 | { |
277 | ovalue = OSDParser.DeserializeJson(value); | 277 | ovalue = OSDParser.DeserializeJson(value); |
278 | } | 278 | } |
279 | catch (Exception e) | 279 | catch (Exception) |
280 | { | 280 | { |
281 | if (value.StartsWith("'") && value.EndsWith("'")) | 281 | if (value.StartsWith("'") && value.EndsWith("'")) |
282 | { | 282 | { |
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs index b502a55..26044f0 100644 --- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs | |||
@@ -262,7 +262,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore | |||
262 | { | 262 | { |
263 | map = new JsonStore(value); | 263 | map = new JsonStore(value); |
264 | } | 264 | } |
265 | catch (Exception e) | 265 | catch (Exception) |
266 | { | 266 | { |
267 | m_log.ErrorFormat("[JsonStore]: Unable to initialize store from {0}", value); | 267 | m_log.ErrorFormat("[JsonStore]: Unable to initialize store from {0}", value); |
268 | return false; | 268 | return false; |
@@ -285,8 +285,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore | |||
285 | 285 | ||
286 | lock (m_JsonValueStore) | 286 | lock (m_JsonValueStore) |
287 | return m_JsonValueStore.Remove(storeID); | 287 | return m_JsonValueStore.Remove(storeID); |
288 | |||
289 | return true; | ||
290 | } | 288 | } |
291 | 289 | ||
292 | // ----------------------------------------------------------------- | 290 | // ----------------------------------------------------------------- |