diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-05-02 10:59:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-02 10:59:29 -0500 |
| commit | e8219cb0509d5aacc75cf862c6b8cad026590958 (patch) | |
| tree | bfd85d36db258f46b74aa9989c1615d9bd7faf72 /indra/llui | |
| parent | a701cce8e0959503156a010683f6d0d57beaae36 (diff) | |
| parent | 7fc5f7e649c564fa8479a72a45459d0cc427d0f8 (diff) | |
Merge branch 'project/gltf_development' into 1357-gltf-asset-prototype
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llconsole.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp index 8fc2978bdd..6a44108741 100644 --- a/indra/llui/llconsole.cpp +++ b/indra/llui/llconsole.cpp @@ -380,7 +380,7 @@ void LLConsole::updateClass() void LLConsole::update() { { - LLMutexLock lock(&mMutex); + LLCoros::LockType lock(mMutex); while (!mLines.empty()) { |