diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-05-06 16:48:58 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2024-05-06 16:48:58 -0500 |
| commit | c6d752b880cacca8fb8f10f28790a50161fcb9ab (patch) | |
| tree | 14910a69597962134f2e78e864a2f05962a16356 /indra/llcrashlogger | |
| parent | 76101843c0d390c25a783f212eb1ea75e508ada4 (diff) | |
| parent | 7d87e41bbd5d4761b1eb17e49b7a00b948d84213 (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
Diffstat (limited to 'indra/llcrashlogger')
| -rw-r--r-- | indra/llcrashlogger/llcrashlogger.cpp | 4 | ||||
| -rw-r--r-- | indra/llcrashlogger/llcrashlogger.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index bb603d3d7f..c448ab1bfe 100644 --- a/indra/llcrashlogger/llcrashlogger.cpp +++ b/indra/llcrashlogger/llcrashlogger.cpp @@ -50,8 +50,8 @@ #include <curl/curl.h> #include <openssl/crypto.h> -BOOL gBreak = false; -BOOL gSent = false; +bool gBreak = false; +bool gSent = false; int LLCrashLogger::ssl_mutex_count = 0; LLCoreInt::HttpMutex ** LLCrashLogger::ssl_mutex_list = NULL; diff --git a/indra/llcrashlogger/llcrashlogger.h b/indra/llcrashlogger/llcrashlogger.h index e3e8110a47..ddab0d01eb 100644 --- a/indra/llcrashlogger/llcrashlogger.h +++ b/indra/llcrashlogger/llcrashlogger.h @@ -77,7 +77,7 @@ protected: static void ssl_locking_callback(int mode, int type, const char * file, int line); S32 mCrashBehavior; - BOOL mCrashInPreviousExec; + bool mCrashInPreviousExec; std::map<std::string, std::string> mFileMap; std::string mGridName; LLControlGroup mCrashSettings; |