summaryrefslogtreecommitdiff
path: root/indra/llui/lllayoutstack.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-04 15:39:33 -0400
committerOz Linden <oz@lindenlab.com>2011-08-04 15:39:33 -0400
commitf42df4cd9fe8eb9e4a778dc9e5fdf94b4d6cfb59 (patch)
tree837c1eebc58b227f7049ee857fa6bd8fbbd25121 /indra/llui/lllayoutstack.cpp
parent94c171d89bae06d0bc259255a917db892019c369 (diff)
parent0b81c19cbe809f041e628da334c305ea33fae2e9 (diff)
merge changes for storm-1538
Diffstat (limited to 'indra/llui/lllayoutstack.cpp')
-rw-r--r--indra/llui/lllayoutstack.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 6a91ec56e4..a59247ba09 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -713,10 +713,7 @@ void LLLayoutStack::createResizeBars()
//static
void LLLayoutStack::updateClass()
{
- LLInstanceTrackerScopedGuard guard;
- for (LLLayoutStack::instance_iter it = guard.beginInstances();
- it != guard.endInstances();
- ++it)
+ for (instance_iter it = beginInstances(); it != endInstances(); ++it)
{
it->updateLayout();
}