diff options
author | Justin Clarke Casey | 2009-01-05 19:36:48 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-01-05 19:36:48 +0000 |
commit | e7ac639f3a8a05858df03a8b5fd611826a56ae97 (patch) | |
tree | 926414fc9cdb51eeec3239d2c558110f7ea27f8b /OpenSim/Framework/Util.cs | |
parent | * add the required System.xml reference as well (diff) | |
download | opensim-SC-e7ac639f3a8a05858df03a8b5fd611826a56ae97.zip opensim-SC-e7ac639f3a8a05858df03a8b5fd611826a56ae97.tar.gz opensim-SC-e7ac639f3a8a05858df03a8b5fd611826a56ae97.tar.bz2 opensim-SC-e7ac639f3a8a05858df03a8b5fd611826a56ae97.tar.xz |
* Centralize references to the well known blank texture 5748decc-f629-461c-9a36-a35a221fe21f to a constant in OpenSim.Framework.Util
Diffstat (limited to 'OpenSim/Framework/Util.cs')
-rw-r--r-- | OpenSim/Framework/Util.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 4cc7134..396996a 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Framework | |||
51 | /// </summary> | 51 | /// </summary> |
52 | public class Util | 52 | public class Util |
53 | { | 53 | { |
54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
55 | 55 | ||
56 | private static uint nextXferID = 5000; | 56 | private static uint nextXferID = 5000; |
57 | private static Random randomClass = new Random(); | 57 | private static Random randomClass = new Random(); |
@@ -66,6 +66,11 @@ namespace OpenSim.Framework | |||
66 | 66 | ||
67 | public static readonly Regex UUIDPattern | 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 | = 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}$"); |
69 | |||
70 | /// <value> | ||
71 | /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards) | ||
72 | /// </value> | ||
73 | public static UUID BLANK_TEXTURE_UUID = new UUID("5748decc-f629-461c-9a36-a35a221fe21f"); | ||
69 | 74 | ||
70 | #region Vector Equations | 75 | #region Vector Equations |
71 | 76 | ||