summaryrefslogtreecommitdiff
path: root/indra/llui/lllayoutstack.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-08 12:27:33 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-08 12:27:33 +0000
commit7660c19ce8fed013eea06450fe6deb4ae92f3ead (patch)
treea6b454d6b93a1b8befc1467a4f3570f5fa89a1af /indra/llui/lllayoutstack.cpp
parent62f0f426532808755f6d97f34fd2d8c9e5d2fa6a (diff)
parent4e28c10971dc4f9a52a7b3f109143dbce3528d21 (diff)
Merge from viewer2 trunk.
Diffstat (limited to 'indra/llui/lllayoutstack.cpp')
-rw-r--r--indra/llui/lllayoutstack.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 1aaba88c49..dc79550eb4 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -816,7 +816,10 @@ void LLLayoutStack::calcMinExtents()
//static
void LLLayoutStack::updateClass()
{
- for (LLLayoutStack::instance_iter it = beginInstances(); it != endInstances(); ++it)
+ LLInstanceTrackerScopedGuard guard;
+ for (LLLayoutStack::instance_iter it = guard.beginInstances();
+ it != guard.endInstances();
+ ++it)
{
it->updateLayout();
}