From b2ef1545e50fb3a17f7c8c99fd9edeb8eb9ba69b Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 6 Feb 2020 22:39:04 +0000 Subject: [PATCH] oops, some fixes --- OpenSim/Framework/SLUtil.cs | 21 ++++++++++++++++++- .../Region/Framework/Scenes/UuidGatherer.cs | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs index da07f791e6..46f40df2ad 100644 --- a/OpenSim/Framework/SLUtil.cs +++ b/OpenSim/Framework/SLUtil.cs @@ -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; } diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs index 3807c21813..05cc536565 100644 --- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs +++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs @@ -267,7 +267,7 @@ namespace OpenSim.Region.Framework.Scenes GetAssetUuids(nextToInspect); - return true; + return m_assetUuidsToInspect.Count != 0; } ///