diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-07-21 20:11:56 +0000 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-07-21 20:11:56 +0000 |
commit | 8153e7d63923a0022ffc1d6f526d4be57d34ba3d (patch) | |
tree | 596d38d591177ccc2ffef695b6f79437c5efce97 /indra/llui/lllayoutstack.cpp | |
parent | 6362aa300766484909cdfc8884edf3e6744fc727 (diff) | |
parent | 19d063952c4706d4344f207775aa5dfdff8802fd (diff) |
Merged in merge-6.4.6 (pull request #207)
Merge master 6.4.6 into DRTVWR-510 (VS2017 update)
Diffstat (limited to 'indra/llui/lllayoutstack.cpp')
-rw-r--r-- | indra/llui/lllayoutstack.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 4a464b3507..4aae1e374b 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -636,10 +636,10 @@ void LLLayoutStack::createResizeBar(LLLayoutPanel* panelp) //static void LLLayoutStack::updateClass() { - for (instance_iter it = beginInstances(); it != endInstances(); ++it) + for (auto& layout : instance_snapshot()) { - it->updateLayout(); - it->mAnimatedThisFrame = false; + layout.updateLayout(); + layout.mAnimatedThisFrame = false; } } |