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 --- OpenSim/Framework/Util.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'OpenSim/Framework/Util.cs') 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 private static readonly DateTime unixEpoch = DateTime.ParseExact("1970-01-01 00:00:00 +0", "yyyy-MM-dd hh:mm:ss z", DateTimeFormatInfo.InvariantInfo).ToUniversalTime(); - 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}$"); + public 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}$"); #region Vector Equations @@ -799,6 +800,11 @@ namespace OpenSim.Framework y += ry; } + /// + /// Is the given string a UUID? + /// + /// + /// public static bool isUUID(string s) { return UUIDPattern.IsMatch(s); -- cgit v1.1