diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-02-05 22:09:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-05 22:09:54 +0200 |
| commit | 9f0faf5c892bba9703c713a29202a8ac48bfdf8b (patch) | |
| tree | 8e64e6074c11005fbb1dac606c176e4470de03e4 /indra/llcommon/llinitparam.h | |
| parent | aa52c852d600aa6b2ea17cdd86f53972c95cca4a (diff) | |
| parent | e3e1672ac40dd4f1f4e458ed09cd7279f0a45fc3 (diff) | |
Merge pull request #735 from secondlife/marchcat/yz-merge
Merge Maint Z into Maint YZ
Diffstat (limited to 'indra/llcommon/llinitparam.h')
| -rw-r--r-- | indra/llcommon/llinitparam.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llinitparam.h b/indra/llcommon/llinitparam.h index 9edc7e40f3..e0d0ab9ac7 100644 --- a/indra/llcommon/llinitparam.h +++ b/indra/llcommon/llinitparam.h @@ -627,7 +627,7 @@ namespace LLInitParam UserData* mUserData; }; - typedef boost::shared_ptr<ParamDescriptor> ParamDescriptorPtr; + typedef std::shared_ptr<ParamDescriptor> ParamDescriptorPtr; // each derived Block class keeps a static data structure maintaining offsets to various params class LL_COMMON_API BlockDescriptor |