diff options
author | Justin Clarke Casey | 2008-11-03 16:57:03 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-03 16:57:03 +0000 |
commit | 57caef119c55eb5bc5504c9a36cb52fe541845f5 (patch) | |
tree | 8dfdc5690f8c8c6d8ca08c4e87d686267e766bb0 /OpenSim/Framework | |
parent | merging changes from IRCBridgeModule in to XIRCBridgeModule; swapping (diff) | |
download | opensim-SC-57caef119c55eb5bc5504c9a36cb52fe541845f5.zip opensim-SC-57caef119c55eb5bc5504c9a36cb52fe541845f5.tar.gz opensim-SC-57caef119c55eb5bc5504c9a36cb52fe541845f5.tar.bz2 opensim-SC-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/Framework')
-rw-r--r-- | OpenSim/Framework/Util.cs | 8 |
1 files changed, 7 insertions, 1 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); |