diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-04-26 11:17:53 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2019-04-26 11:17:53 -0400 |
| commit | 0d596aa4de2f583862274350ce6287c0ed8c2bec (patch) | |
| tree | 90a6ca5b29d5c99b585233d059e16dccc23a2e19 /indra/llcommon/lluuid.cpp | |
| parent | 70aa89f708254c47766f4629e9131ea492829129 (diff) | |
| parent | 85b431d5137886927efef35ca558bc8a998a5212 (diff) | |
Automated merge with file:///Users/nat/linden/viewer-gridselect
Diffstat (limited to 'indra/llcommon/lluuid.cpp')
| -rw-r--r-- | indra/llcommon/lluuid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp index d4af2c6b01..8f33d789eb 100644 --- a/indra/llcommon/lluuid.cpp +++ b/indra/llcommon/lluuid.cpp @@ -738,7 +738,7 @@ void LLUUID::getCurrentTime(uuid_time_t *timestamp) getSystemTime(&time_last); uuids_this_tick = uuids_per_tick; init = TRUE; - mMutex = new LLMutex(NULL); + mMutex = new LLMutex(); } uuid_time_t time_now = {0,0}; |