summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2010-02-11 22:29:43 +0800
committerangela <angela@lindenlab.com>2010-02-11 22:29:43 +0800
commit01561ea13ab5741aee70b8873d81078bafb55b86 (patch)
tree2c1267e05ccab296525ad1dea469a60560c37a30 /indra/llui
parente747e9a3da3166de88dea1af213a36694135b820 (diff)
parent69bed1f123f35b6124f4e3255df156b7fe82418b (diff)
merge from remote repo
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llconsole.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp
index 331d78da8c..a4f69e7ac1 100644
--- a/indra/llui/llconsole.cpp
+++ b/indra/llui/llconsole.cpp
@@ -376,7 +376,9 @@ LLConsole::Paragraph::Paragraph (LLWString str, const LLColor4 &color, F32 add_t
// static
void LLConsole::updateClass()
{
- for (instance_iter it = beginInstances(); it != endInstances(); ++it)
+ LLInstanceTrackerScopedGuard guard;
+
+ for (instance_iter it = guard.beginInstances(); it != guard.endInstances(); ++it)
{
it->update();
}