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/llplugin/llpluginprocessparent.h | |
| parent | a701cce8e0959503156a010683f6d0d57beaae36 (diff) | |
| parent | 7fc5f7e649c564fa8479a72a45459d0cc427d0f8 (diff) | |
Merge branch 'project/gltf_development' into 1357-gltf-asset-prototype
Diffstat (limited to 'indra/llplugin/llpluginprocessparent.h')
| -rw-r--r-- | indra/llplugin/llpluginprocessparent.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h index 01627925d7..2f9dc921ea 100644 --- a/indra/llplugin/llpluginprocessparent.h +++ b/indra/llplugin/llpluginprocessparent.h @@ -207,7 +207,7 @@ private: apr_pollfd_t mPollFD; static apr_pollset_t *sPollSet; static bool sPollsetNeedsRebuild; - static LLMutex *sInstancesMutex; + static LLCoros::Mutex *sInstancesMutex; static mapInstances_t sInstances; static void dirtyPollSet(); static void updatePollset(); |