diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-12-15 22:12:26 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-12-15 22:12:26 +0000 |
| commit | 23fc6ac098707830c219dd2d981af83f96c9714b (patch) | |
| tree | 014c480a7dc85ea6365a486984aa9667fb7a4dce /indra/llcrashlogger/llcrashlogger.cpp | |
| parent | 828e58432981e7c256618bd293f77906abaae699 (diff) | |
| parent | 0952086eeb937707d1470989579611a1966cafbe (diff) | |
Merged in DV546-merge-6.5.2 (pull request #814)
DRTVWR-546 merge up to 6.5.2
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(); } |