diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 19:48:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 19:48:25 +0300 |
| commit | 1bcc4e7f709bf7067121b5891f3f7db3b99235a0 (patch) | |
| tree | bc9cea56b8e236f52df392084552018c387cff2c /indra/newview/llmaterialmgr.cpp | |
| parent | 09454c53a48e88a9cdd54f68ac507694a766b213 (diff) | |
| parent | 428f21cf795f440f69a772b314f877ea0c6d4741 (diff) | |
Merge pull request #1313 from secondlife/marchcat/x-merge
Release (Maint YZ) -> Maint X merge
Diffstat (limited to 'indra/newview/llmaterialmgr.cpp')
| -rw-r--r-- | indra/newview/llmaterialmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmaterialmgr.cpp b/indra/newview/llmaterialmgr.cpp index 3b59b2f05e..577ab0048f 100644 --- a/indra/newview/llmaterialmgr.cpp +++ b/indra/newview/llmaterialmgr.cpp @@ -68,7 +68,7 @@ class LLMaterialHttpHandler : public LLHttpSDHandler { public: typedef boost::function<void(bool, const LLSD&)> CallbackFunction; - typedef boost::shared_ptr<LLMaterialHttpHandler> ptr_t; + typedef std::shared_ptr<LLMaterialHttpHandler> ptr_t; LLMaterialHttpHandler(const std::string& method, CallbackFunction cback); |