diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-12-15 21:50:40 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-12-15 21:50:40 +0200 |
| commit | edb629352822d4c7737aff2e5b719b36eadfeb50 (patch) | |
| tree | 0bb17e8f0904e3e3e5e5976dafa5f1095758f3b8 /indra/llcrashlogger/llcrashlogger.cpp | |
| parent | 3209ad92d698c804b15d2f69f7aa1d29067f7fe0 (diff) | |
| parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) | |
Merge branch 'master' into DRTVWR-530-maint
Diffstat (limited to 'indra/llcrashlogger/llcrashlogger.cpp')
| -rw-r--r-- | indra/llcrashlogger/llcrashlogger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index e02f3a6306..0d8fb4863b 100644 --- a/indra/llcrashlogger/llcrashlogger.cpp +++ b/indra/llcrashlogger/llcrashlogger.cpp @@ -596,7 +596,7 @@ bool LLCrashLogger::init() #if LL_WINDOWS Sleep(1000); #else - sleep(1); + ::sleep(1); #endif locked = mKeyMaster.checkMaster(); } |