diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-22 09:30:04 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-22 09:30:04 -0400 |
commit | eb81d5f23fc725f53857d7a62923e273a057c455 (patch) | |
tree | 5c1ba76e722d9630fa597023a1e6c196a04f758c /indra/newview/llsculptidsize.cpp | |
parent | f8ccb39b8d944f9d2bf4308f909273cd5a35cbe7 (diff) | |
parent | 47985e5822ce9fdebb7443e13b3c1a781a842ecd (diff) |
Merge remote-tracking branch 'DRTVWR-600-maint-A' into nat/kwds
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 |