diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-02-14 09:05:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-02-14 09:05:55 -0500 |
| commit | c880c961bb2a0838bc529efc07cfeb12f5636d88 (patch) | |
| tree | beff6cda58f68c5d95277cf77957dc96c2a79dfd /indra/llcommon/lluuid.h | |
| parent | 841dc5da2ef9626fa4ab9255681d217df62a6b0b (diff) | |
| parent | e87000ba0750e55d9d6b55feccc4124f5d2b4b74 (diff) | |
merge changes for 3.4.5
Diffstat (limited to 'indra/llcommon/lluuid.h')
| -rw-r--r-- | indra/llcommon/lluuid.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcommon/lluuid.h b/indra/llcommon/lluuid.h index 0b9e7d0cd0..7889828c85 100644 --- a/indra/llcommon/lluuid.h +++ b/indra/llcommon/lluuid.h @@ -31,6 +31,8 @@ #include "stdtypes.h" #include "llpreprocessor.h" +class LLMutex; + const S32 UUID_BYTES = 16; const S32 UUID_WORDS = 4; const S32 UUID_STR_LENGTH = 37; // actually wrong, should be 36 and use size below @@ -118,6 +120,7 @@ public: static BOOL validate(const std::string& in_string); // Validate that the UUID string is legal. static const LLUUID null; + static LLMutex * mMutex; static U32 getRandomSeed(); static S32 getNodeID(unsigned char * node_id); |