OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oops

master
UbitUmarov 2020-02-10 02:19:35 +00:00
parent fb2380efd6
commit f3238781cc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/SLUtil.cs
View File

@ -457,7 +457,7 @@ namespace OpenSim.Framework
indx = getField(note, indx, "asset_id", false, out valuestr); indx = getField(note, indx, "asset_id", false, out valuestr);
if (indx < 0) if (indx < 0)
{ {
indx = getField(note, indx, "shadow_id", false, out valuestr); indx = getField(note, curindx, "shadow_id", false, out valuestr);
if (indx < 0) if (indx < 0)
return null; return null;
if (!UUID.TryParse(valuestr, out assetID)) if (!UUID.TryParse(valuestr, out assetID))
@ -570,10 +570,12 @@ namespace OpenSim.Framework
indx = note.IndexOf('}',indx); // skip to end of permissions indx = note.IndexOf('}',indx); // skip to end of permissions
if (indx < 0) if (indx < 0)
return null; return null;
int curindx = indx;
indx = getField(note, indx, "asset_id", false, out valuestr); indx = getField(note, indx, "asset_id", false, out valuestr);
if (indx < 0) if (indx < 0)
{ {
indx = getField(note, indx, "shadow_id", false, out valuestr); indx = getField(note, curindx, "shadow_id", false, out valuestr);
if (indx < 0) if (indx < 0)
return null; return null;
if (!UUID.TryParse(valuestr, out assetID)) if (!UUID.TryParse(valuestr, out assetID))