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/llsculptidsize.cpp | |
| parent | 40a881dd26cbf0b92e03ec20e296b94e89bdb2c3 (diff) | |
| parent | d98fc504a1d4bc292ba86acdda053c8b4598a193 (diff) | |
Merge 'main' into release/luau-scripting on promotion of Maint YZ
Diffstat (limited to 'indra/newview/llsculptidsize.cpp')
| -rw-r--r-- | indra/newview/llsculptidsize.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsculptidsize.cpp b/indra/newview/llsculptidsize.cpp index 5d051d0ebf..bedee32213 100644 --- a/indra/newview/llsculptidsize.cpp +++ b/indra/newview/llsculptidsize.cpp @@ -66,7 +66,7 @@ void LLSculptIDSize::inc(const LLDrawable *pdrawable, int sz) if (itLU.first == itLU.second) { //register //llassert(mSizeInfo.get<tag_BY_DRAWABLE>().end() == mSizeInfo.get<tag_BY_DRAWABLE>().find(pdrawable)); - mSizeInfo.get<tag_BY_DRAWABLE>().insert(Info(pdrawable, sz, boost::make_shared<SizeSum>(sz), sculptId)); + mSizeInfo.get<tag_BY_DRAWABLE>().insert(Info(pdrawable, sz, std::make_shared<SizeSum>(sz), sculptId)); total_size = sz; } else |