diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-05-06 15:44:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-06 15:44:19 -0700 |
| commit | 84827a7cb8d4b7a58309f98c7d4df4cfeb173935 (patch) | |
| tree | b91494298eab93bbd8dd9b00722b7a30714a1b9c /indra/llcrashlogger | |
| parent | 76101843c0d390c25a783f212eb1ea75e508ada4 (diff) | |
| parent | 8b747cee182cd8e95063fa152d9b5d7383cb1c74 (diff) | |
Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge
Merge Maint A to development
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; |