From 57caef119c55eb5bc5504c9a36cb52fe541845f5 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 3 Nov 2008 16:57:03 +0000
Subject: * Use the UUID regex sitting in utils for detection of uuids embedded
in scripts * Replaces the one in the module itself, which had a dumb bug in
it anyway
---
.../Modules/World/Archiver/ArchiveWriteRequestPreparation.cs | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
(limited to 'OpenSim/Region/Environment/Modules/World')
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
index b520642..1fbc20f 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -54,14 +54,6 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
protected string m_savePath;
///
- /// Used for identifying uuids embedded in scripts
- ///
- 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);
-
- ///
/// 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)
--
cgit v1.1