diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-04 13:58:18 +0300 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-04 13:58:18 +0300 |
commit | 15711b29afd293acd23d948a51ea65795335c95f (patch) | |
tree | 8fdbb8e7275ed5d16a19d8bc3434b69d687b0b61 /indra/llui/llfloater.cpp | |
parent | 9345f01d4b61f857ed540cf725c8cd0ee1b0ef24 (diff) | |
parent | e1189d0e2ee47539edc68c3532e0a5ce64d5dcd1 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r-- | indra/llui/llfloater.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 6babaf936b..fad98e553f 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -330,6 +330,7 @@ void LLFloater::addDragHandle() addChild(mDragHandle); } layoutDragHandle(); + applyTitle(); } void LLFloater::layoutDragHandle() @@ -348,7 +349,6 @@ void LLFloater::layoutDragHandle() } mDragHandle->setRect(rect); updateTitleButtons(); - applyTitle(); } void LLFloater::addResizeCtrls() @@ -2519,7 +2519,7 @@ LLFloater *LLFloaterView::getBackmost() const void LLFloaterView::syncFloaterTabOrder() { - // look for a visible modal dialog, starting from first (should be only one) + // look for a visible modal dialog, starting from first LLModalDialog* modal_dialog = NULL; for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it) { |