diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-02-05 22:04:40 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-02-05 22:04:40 +0200 |
| commit | e3e1672ac40dd4f1f4e458ed09cd7279f0a45fc3 (patch) | |
| tree | 8e64e6074c11005fbb1dac606c176e4470de03e4 /indra/newview/llviewermenufile.h | |
| parent | aa52c852d600aa6b2ea17cdd86f53972c95cca4a (diff) | |
| parent | 6762f60d78277cf27afd8353aa531afb26bd560c (diff) | |
Merge branch 'DRTVWR-599-maint-Z' into release/maint-yz
# Conflicts:
# indra/newview/llchiclet.h
Diffstat (limited to 'indra/newview/llviewermenufile.h')
| -rw-r--r-- | indra/newview/llviewermenufile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenufile.h b/indra/newview/llviewermenufile.h index ff2ee693fd..6b9df6df28 100644 --- a/indra/newview/llviewermenufile.h +++ b/indra/newview/llviewermenufile.h @@ -145,7 +145,7 @@ public: virtual void notify(const std::vector<std::string>& filenames); private: - boost::shared_ptr<LLPluginClassMedia> mPlugin; + std::shared_ptr<LLPluginClassMedia> mPlugin; }; |