aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Util.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-22 02:16:46 +0100
committerJustin Clark-Casey (justincc)2011-10-22 02:16:46 +0100
commitffdf59a57c936189e3b161b79b4a76a3a9b260bb (patch)
treec857a6214e291e5b91f1241107b84baa3b9f246f /OpenSim/Framework/Util.cs
parentredirect UserInventoryHelpers to use a different CreateNotecardAsset() so we ... (diff)
downloadopensim-SC_OLD-ffdf59a57c936189e3b161b79b4a76a3a9b260bb.zip
opensim-SC_OLD-ffdf59a57c936189e3b161b79b4a76a3a9b260bb.tar.gz
opensim-SC_OLD-ffdf59a57c936189e3b161b79b4a76a3a9b260bb.tar.bz2
opensim-SC_OLD-ffdf59a57c936189e3b161b79b4a76a3a9b260bb.tar.xz
Get UUIDGatherer to scan notecards in the graph for asset uuids.
This is to support npc baked texture saving in oars and iars. May address http://opensimulator.org/mantis/view.php?id=5743
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Util.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index c4fc643..21cfc09 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -46,7 +46,6 @@ using System.Threading;
46using log4net; 46using log4net;
47using Nini.Config; 47using Nini.Config;
48using Nwc.XmlRpc; 48using Nwc.XmlRpc;
49// using BclExtras;
50using OpenMetaverse; 49using OpenMetaverse;
51using OpenMetaverse.StructuredData; 50using OpenMetaverse.StructuredData;
52using Amib.Threading; 51using 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;