ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the return values for JsonDestroyStore, JsonRemoveValue, and JsonSetValue.

Browse Source 
Fix the link message status when reading a notecard.
This commit is contained in:
Mic Bowman
2013-02-08 12:00:16 -08:00
parent c2bf91c5e3
commit 2b5eba9c74
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
View File

@@ -250,6 +250,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
return true;
}
// pkey will be the final element in the path, we pull it out here to make sure
// that the assignment works correctly
string pkey = path.Pop();
string pexpr = PathExpressionToKey(path);
if (pexpr != "")
@@ -259,7 +261,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
if (result == null)
return false;
// Check for and extract array references
// Check pkey, the last element in the path, for and extract array references
MatchCollection amatches = m_ArrayPattern.Matches(pkey,0);
if (amatches.Count > 0)
{
@@ -307,16 +309,23 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
if (result is OSDMap)
{
// this is the assignment case
OSDMap hmap = result as OSDMap;
if (ovalue != null)
{
hmap[hkey] = ovalue;
InvokeNextCallback(pexpr + pkey);
return true;
}
else if (hmap.ContainsKey(hkey))
// this is the remove case
if (hmap.ContainsKey(hkey))
{
hmap.Remove(hkey);
return true;
return true;
}
return false;
}
return false;