diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-02 10:15:33 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-02 10:15:33 -0500 |
| commit | cd1871d2e39bfee8a6e5bc61ece40a764ff7cdb4 (patch) | |
| tree | ab3704b8326f48aa8c934242226482cba33e5257 /indra/llcommon/lluuid.h | |
| parent | 8c8d5ef924d552b945395d900fb6e1cd266196df (diff) | |
| parent | 55dfff68d4c63918661def881280eae76a63f233 (diff) | |
merge changes for DRTVWR-269
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); |