From 161e29bf6f83b8b83446e387bc895f31d99d3066 Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Fri, 10 Feb 2012 15:07:08 -0600 Subject: [PATCH] Make navigation bar container big enough to hold the favorites bar too. Fixes FiRE-5013. --- indra/newview/llnavigationbar.cpp | 9 --------- indra/newview/skins/default/xui/en/main_view.xml | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index b7946b295b..c4a9ee9b14 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -321,18 +321,9 @@ BOOL LLNavigationBar::postBuild() mDefaultFpRect = fp->getRect(); mDefaultNpRect = np->getRect(); mDefaultFrameRect = navFrame->getRect(); - - llinfos << "Navigation bar rectangles: Container = " << mDefaultNavContainerRect - << ", favorites panel = " << mDefaultFpRect - << ", navigation panel = " << mDefaultNpRect - << ", frame = " << mDefaultFrameRect << llendl; mDefaultNavContainerRect.set(mDefaultNavContainerRect.mLeft, mDefaultNpRect.mTop,mDefaultNavContainerRect.mRight, mDefaultFpRect.mBottom); setRect(mDefaultNavContainerRect); - - llinfos << "Updated container = " - << mDefaultNavContainerRect << llendl; - navFrame->setRect(mDefaultFrameRect); np->setRect(mDefaultNpRect); fp->setRect(mDefaultFpRect); diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index 8a653d79d8..b9a40a6cd7 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -56,7 +56,7 @@ name="world_view_rect" width="1024"/>