diff options
| author | Melanie | 2011-10-25 03:19:10 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 03:19:10 +0100 |
| commit | 02f0aa592d665c7bd7526a077e97cf2637a259f6 (patch) | |
| tree | 966d5bb4535a76bd422b5841d3b2c0fccc8495cb /OpenSim/Framework/Util.cs | |
| parent | Merge commit '30320505fa54640baf4ecaff8bb743f62ef01f86' into bigmerge (diff) | |
| parent | Get UUIDGatherer to scan notecards in the graph for asset uuids. (diff) | |
| download | opensim-SC-02f0aa592d665c7bd7526a077e97cf2637a259f6.zip opensim-SC-02f0aa592d665c7bd7526a077e97cf2637a259f6.tar.gz opensim-SC-02f0aa592d665c7bd7526a077e97cf2637a259f6.tar.bz2 opensim-SC-02f0aa592d665c7bd7526a077e97cf2637a259f6.tar.xz | |
Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge
Diffstat (limited to 'OpenSim/Framework/Util.cs')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 1cbb53f..0b2fbb9 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -46,7 +46,6 @@ using System.Threading; | |||
| 46 | using log4net; | 46 | using log4net; |
| 47 | using Nini.Config; | 47 | using Nini.Config; |
| 48 | using Nwc.XmlRpc; | 48 | using Nwc.XmlRpc; |
| 49 | // using BclExtras; | ||
| 50 | using OpenMetaverse; | 49 | using OpenMetaverse; |
| 51 | using OpenMetaverse.StructuredData; | 50 | using OpenMetaverse.StructuredData; |
| 52 | using Amib.Threading; | 51 | using Amib.Threading; |
| @@ -91,8 +90,10 @@ namespace OpenSim.Framework | |||
| 91 | private static readonly DateTime unixEpoch = | 90 | private static readonly DateTime unixEpoch = |
| 92 | DateTime.ParseExact("1970-01-01 00:00:00 +0", "yyyy-MM-dd hh:mm:ss z", DateTimeFormatInfo.InvariantInfo).ToUniversalTime(); | 91 | DateTime.ParseExact("1970-01-01 00:00:00 +0", "yyyy-MM-dd hh:mm:ss z", DateTimeFormatInfo.InvariantInfo).ToUniversalTime(); |
| 93 | 92 | ||
| 94 | public static readonly Regex UUIDPattern | 93 | private static readonly string rawUUIDPattern |
| 95 | = 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}$"); | 94 | = "[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}"; |
| 95 | public static readonly Regex PermissiveUUIDPattern = new Regex(rawUUIDPattern); | ||
| 96 | public static readonly Regex UUIDPattern = new Regex(string.Format("^{0}$", rawUUIDPattern)); | ||
| 96 | 97 | ||
| 97 | public static FireAndForgetMethod DefaultFireAndForgetMethod = FireAndForgetMethod.SmartThreadPool; | 98 | public static FireAndForgetMethod DefaultFireAndForgetMethod = FireAndForgetMethod.SmartThreadPool; |
| 98 | public static FireAndForgetMethod FireAndForgetMethod = DefaultFireAndForgetMethod; | 99 | public static FireAndForgetMethod FireAndForgetMethod = DefaultFireAndForgetMethod; |