diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-04-24 16:35:00 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-04-24 16:35:00 -0400 |
| commit | 6d860672ec3e05660844a40c56b8644130a1f6b6 (patch) | |
| tree | 2cf0f229f5f8c0e019255e2265f6bfb67af1c93c /indra/newview/llviewermedia.h | |
| parent | 40a881dd26cbf0b92e03ec20e296b94e89bdb2c3 (diff) | |
| parent | d98fc504a1d4bc292ba86acdda053c8b4598a193 (diff) | |
Merge 'main' into release/luau-scripting on promotion of Maint YZ
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rw-r--r-- | indra/newview/llviewermedia.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index ad7c4bcefa..03899b6b8f 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -431,7 +431,7 @@ private: private: // a single media url with some data and an impl. - boost::shared_ptr<LLPluginClassMedia> mMediaSource; + std::shared_ptr<LLPluginClassMedia> mMediaSource; LLMutex mLock; F64 mZoomFactor; LLUUID mTextureId; |