diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-09-05 08:37:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-05 08:37:16 -0400 |
| commit | 7ac4c3b56e5246fceaa73e7c9c665d3c04827d6c (patch) | |
| tree | e96334bd9299102ebdaf229eec9cf4c2165f8c2f /indra/llcommon/llevents.h | |
| parent | 487973d3f0ee9b8583b3d977ca6a405cba5fe518 (diff) | |
| parent | 6a747e1ce027700a3609f4c377179bfa29c3ce31 (diff) | |
Merge pull request #2450 from secondlife/lua-merge
Merge updated 'main' branch into release/luau-scripting
Diffstat (limited to 'indra/llcommon/llevents.h')
| -rw-r--r-- | indra/llcommon/llevents.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llevents.h b/indra/llcommon/llevents.h index abc25ba400..f92257238d 100644 --- a/indra/llcommon/llevents.h +++ b/indra/llcommon/llevents.h @@ -50,9 +50,9 @@ #endif #include <boost/optional/optional.hpp> +#include "llcoromutex.h" #include "lldependencies.h" #include "llexception.h" -#include "llmutex.h" #include "llsd.h" #include "llsingleton.h" @@ -557,7 +557,7 @@ private: private: std::string mName; - LLMutex mConnectionListMutex; + llcoro::Mutex mConnectionListMutex; protected: template <typename LISTENER> |