diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-08 12:27:33 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-08 12:27:33 +0000 |
| commit | 7660c19ce8fed013eea06450fe6deb4ae92f3ead (patch) | |
| tree | a6b454d6b93a1b8befc1467a4f3570f5fa89a1af /indra/newview/llnamelistctrl.cpp | |
| parent | 62f0f426532808755f6d97f34fd2d8c9e5d2fa6a (diff) | |
| parent | 4e28c10971dc4f9a52a7b3f109143dbce3528d21 (diff) | |
Merge from viewer2 trunk.
Diffstat (limited to 'indra/newview/llnamelistctrl.cpp')
| -rw-r--r-- | indra/newview/llnamelistctrl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index d579058c32..40e8b64362 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -356,8 +356,9 @@ void LLNameListCtrl::refresh(const LLUUID& id, const std::string& first, void LLNameListCtrl::refreshAll(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group) { + LLInstanceTrackerScopedGuard guard; LLInstanceTracker<LLNameListCtrl>::instance_iter it; - for (it = beginInstances(); it != endInstances(); ++it) + for (it = guard.beginInstances(); it != guard.endInstances(); ++it) { LLNameListCtrl& ctrl = *it; ctrl.refresh(id, first, last, is_group); |