summaryrefslogtreecommitdiff
path: root/indra/llui/lllayoutstack.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-02-08 14:58:53 -0500
committerLoren Shih <seraph@lindenlab.com>2010-02-08 14:58:53 -0500
commit399d70eede54dff2ba6d14b33f85fdad4d33a662 (patch)
treece922e0963b8d46c236c4320b574916507fa3b65 /indra/llui/lllayoutstack.cpp
parent7e1932878563e5847335d5dcb66c9b23232c372c (diff)
parent19f4240f977fc26d97e686c4e3a1f13b063e191c (diff)
automated merge viewer2.0->viewer2.0
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();
}