aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-03 16:57:03 +0000
committerJustin Clarke Casey2008-11-03 16:57:03 +0000
commit57caef119c55eb5bc5504c9a36cb52fe541845f5 (patch)
tree8dfdc5690f8c8c6d8ca08c4e87d686267e766bb0 /OpenSim/Region/Environment/Modules
parentmerging changes from IRCBridgeModule in to XIRCBridgeModule; swapping (diff)
downloadopensim-SC_OLD-57caef119c55eb5bc5504c9a36cb52fe541845f5.zip
opensim-SC_OLD-57caef119c55eb5bc5504c9a36cb52fe541845f5.tar.gz
opensim-SC_OLD-57caef119c55eb5bc5504c9a36cb52fe541845f5.tar.bz2
opensim-SC_OLD-57caef119c55eb5bc5504c9a36cb52fe541845f5.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs10
1 files changed, 1 insertions, 9 deletions
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)