diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-08 10:37:34 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-08 10:37:34 -0700 |
| commit | 65cb4b6d20b52ffebdc93e0e19f99520f6364dde (patch) | |
| tree | d2b6ff74ce2d40f5de91b95fe7b5e21701d6e181 /indra/llcommon/lluuid.cpp | |
| parent | f14888b6166f91533e778e94701b74a9639ebefd (diff) | |
| parent | 34322f8f37380df868703051230f2a4109602b3f (diff) | |
Merge 6.2.2
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}; |