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

* Use the UUID regex sitting in utils for detection of uuids embedded in scripts

Browse Source 
* Replaces the one in the module itself, which had a dumb bug in it anyway
This commit is contained in:
Justin Clarke Casey
2008-11-03 16:57:03 +00:00
parent d6d2a38e76
commit 57caef119c
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
View File

@@ -53,14 +53,6 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
protected Scene m_scene;
protected string m_savePath;
/// <summary>
/// Used for identifying uuids embedded in scripts
/// </summary>
protected static readonly Regex m_uuidRegex
= new Regex(
"[0-9a-eA-E]{8}-[0-9a-eA-E]{4}-[0-9a-eA-E]{4}-[0-9a-eA-E]{4}-[0-9a-eA-E]{12}",
RegexOptions.Compiled);
/// <summary>
/// Used as a temporary store of an asset which represents an object. This can be a null if no appropriate
/// asset was found by the asset service.
@@ -136,7 +128,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
{
string script = Utils.BytesToString(scriptAsset.Data);
//m_log.DebugFormat("[ARCHIVER]: Script {0}", script);
MatchCollection uuidMatches = m_uuidRegex.Matches(script);
MatchCollection uuidMatches = Util.UUIDPattern.Matches(script);
//m_log.DebugFormat("[ARCHIVER]: Found {0} matches in script", uuidMatches.Count);
foreach (Match uuidMatch in uuidMatches)