diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2022-11-02 12:20:05 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2022-11-02 12:20:05 -0400 |
| commit | 7b35b7baea861ae58cd01826bb57fe995dc8aa52 (patch) | |
| tree | d73198b7a3f55a3644f8b0faf60a0283d5a81f17 /indra/newview/llmediadataclient.cpp | |
| parent | 13456d01a71b873ed59e3839f817434357fc8da5 (diff) | |
| parent | 15b5dedb2dc139c85461e7c867164b65cc6fc628 (diff) | |
DRTVWR-575: Merge branch 'master' into fix-monterey
Diffstat (limited to 'indra/newview/llmediadataclient.cpp')
| -rw-r--r-- | indra/newview/llmediadataclient.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llmediadataclient.cpp b/indra/newview/llmediadataclient.cpp index bc45eb6d3a..9d0f62a30d 100644 --- a/indra/newview/llmediadataclient.cpp +++ b/indra/newview/llmediadataclient.cpp @@ -154,8 +154,7 @@ void mark_dead_and_remove_if(T &c, const PredicateMatchRequest &matchPred) if (matchPred(*it)) { (*it)->markDead(); - // *TDOO: When C++11 is in change the following line to: it = c.erase(it); - c.erase(it++); + it = c.erase(it); } else { |