diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 18:45:54 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 18:45:54 +0300 |
commit | 428f21cf795f440f69a772b314f877ea0c6d4741 (patch) | |
tree | bc9cea56b8e236f52df392084552018c387cff2c /indra/newview/llsculptidsize.h | |
parent | 09454c53a48e88a9cdd54f68ac507694a766b213 (diff) | |
parent | d98fc504a1d4bc292ba86acdda053c8b4598a193 (diff) |
Merge branch 'main' into marchcat/x-merge
Diffstat (limited to 'indra/newview/llsculptidsize.h')
-rw-r--r-- | indra/newview/llsculptidsize.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsculptidsize.h b/indra/newview/llsculptidsize.h index 87ee417b86..679fcbd44c 100644 --- a/indra/newview/llsculptidsize.h +++ b/indra/newview/llsculptidsize.h @@ -52,7 +52,7 @@ public: struct Info { - typedef boost::shared_ptr<SizeSum> PtrSizeSum; + typedef std::shared_ptr<SizeSum> PtrSizeSum; Info(const LLDrawable *drawable, int size, PtrSizeSum sizeInfo, LLUUID sculptId) : mDrawable(drawable) |