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

oops, some fixes

master
UbitUmarov 2020-02-06 22:39:04 +00:00
parent 88d91b68f7
commit b2ef1545e5
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Framework/SLUtil.cs
View File

@ -835,7 +835,9 @@ namespace OpenSim.Framework
{
string valuestr;
UUID assetID = UUID.Zero;
indx = note.IndexOf('}'); // skip to end of permissions
indx = note.IndexOf('}',indx); // skip to end of permissions
if (indx < 0)
return null;
indx = getField(note, indx, "asset_id", false, out valuestr);
if (indx < 0)
{
@ -852,6 +854,23 @@ namespace OpenSim.Framework
return null;
}
ids.Add(assetID);
indx = note.IndexOf('}', indx); // skip to end of sale
if (indx < 0)
return null;
indx = getField(note, indx, "name", false, out valuestr); // avoid name contents
if (indx < 0)
return null;
indx = getField(note, indx, "desc", false, out valuestr); // avoid desc contents
if (indx < 0)
return null;
if(count > 1)
{
indx = note.IndexOf("ext char index", indx); // skip to next
if (indx < 0)
return null;
}
--count;
}

2
OpenSim/Region/Framework/Scenes/UuidGatherer.cs
View File

@ -267,7 +267,7 @@ namespace OpenSim.Region.Framework.Scenes
GetAssetUuids(nextToInspect);
return true;
return m_assetUuidsToInspect.Count != 0;
}
/// <summary>