aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Util.cs8
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs10
2 files changed, 8 insertions, 10 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index b8080ec..122f104 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -64,7 +64,8 @@ namespace OpenSim.Framework
64 private static readonly DateTime unixEpoch = 64 private static readonly DateTime unixEpoch =
65 DateTime.ParseExact("1970-01-01 00:00:00 +0", "yyyy-MM-dd hh:mm:ss z", DateTimeFormatInfo.InvariantInfo).ToUniversalTime(); 65 DateTime.ParseExact("1970-01-01 00:00:00 +0", "yyyy-MM-dd hh:mm:ss z", DateTimeFormatInfo.InvariantInfo).ToUniversalTime();
66 66
67 private static readonly Regex UUIDPattern = new Regex("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"); 67 public static readonly Regex UUIDPattern
68 = new Regex("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$");
68 69
69 #region Vector Equations 70 #region Vector Equations
70 71
@@ -799,6 +800,11 @@ namespace OpenSim.Framework
799 y += ry; 800 y += ry;
800 } 801 }
801 802
803 /// <summary>
804 /// Is the given string a UUID?
805 /// </summary>
806 /// <param name="s"></param>
807 /// <returns></returns>
802 public static bool isUUID(string s) 808 public static bool isUUID(string s)
803 { 809 {
804 return UUIDPattern.IsMatch(s); 810 return UUIDPattern.IsMatch(s);
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
54 protected string m_savePath; 54 protected string m_savePath;
55 55
56 /// <summary> 56 /// <summary>
57 /// Used for identifying uuids embedded in scripts
58 /// </summary>
59 protected static readonly Regex m_uuidRegex
60 = new Regex(
61 "[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}",
62 RegexOptions.Compiled);
63
64 /// <summary>
65 /// Used as a temporary store of an asset which represents an object. This can be a null if no appropriate 57 /// Used as a temporary store of an asset which represents an object. This can be a null if no appropriate
66 /// asset was found by the asset service. 58 /// asset was found by the asset service.
67 /// </summary> 59 /// </summary>
@@ -136,7 +128,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
136 { 128 {
137 string script = Utils.BytesToString(scriptAsset.Data); 129 string script = Utils.BytesToString(scriptAsset.Data);
138 //m_log.DebugFormat("[ARCHIVER]: Script {0}", script); 130 //m_log.DebugFormat("[ARCHIVER]: Script {0}", script);
139 MatchCollection uuidMatches = m_uuidRegex.Matches(script); 131 MatchCollection uuidMatches = Util.UUIDPattern.Matches(script);
140 //m_log.DebugFormat("[ARCHIVER]: Found {0} matches in script", uuidMatches.Count); 132 //m_log.DebugFormat("[ARCHIVER]: Found {0} matches in script", uuidMatches.Count);
141 133
142 foreach (Match uuidMatch in uuidMatches) 134 foreach (Match uuidMatch in uuidMatches)