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/newview/llviewermedia.h | |
| parent | a701cce8e0959503156a010683f6d0d57beaae36 (diff) | |
| parent | 7fc5f7e649c564fa8479a72a45459d0cc427d0f8 (diff) | |
Merge branch 'project/gltf_development' into 1357-gltf-asset-prototype
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rw-r--r-- | indra/newview/llviewermedia.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 03899b6b8f..378297bf91 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -182,7 +182,7 @@ private: // Implementation functions not exported into header file class LLViewerMediaImpl - : public LLMouseHandler, public LLRefCount, public LLPluginClassMediaOwner, public LLViewerMediaEventEmitter, public LLEditMenuHandler + : public LLMouseHandler, public LLThreadSafeRefCount, public LLPluginClassMediaOwner, public LLViewerMediaEventEmitter, public LLEditMenuHandler { LOG_CLASS(LLViewerMediaImpl); public: @@ -432,7 +432,7 @@ private: private: // a single media url with some data and an impl. std::shared_ptr<LLPluginClassMedia> mMediaSource; - LLMutex mLock; + LLCoros::Mutex mLock; F64 mZoomFactor; LLUUID mTextureId; bool mMovieImageHasMips; |