diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-10-29 18:10:25 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-10-29 18:10:25 +0200 |
| commit | 7d64c6a226046d962bf5cd2b1e53df6fe33a730d (patch) | |
| tree | 2bf46411604c735d6efb975806c03e695b516cab /indra/newview/llnavigationbar.cpp | |
| parent | 19e99af208f0dad118cf3029f409442bca5d3e21 (diff) | |
| parent | 191547dcb232535d24091be0fb4169c6c7eb89ef (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
| -rw-r--r-- | indra/newview/llnavigationbar.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index c32ef2f22b..9a05812847 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -164,8 +164,6 @@ TODO: - Load navbar height from saved settings (as it's done for status bar) or think of a better way. */ -S32 NAVIGATION_BAR_HEIGHT = 60; // *HACK, used in llviewerwindow.cpp - LLNavigationBar::LLNavigationBar() : mTeleportHistoryMenu(NULL), mBtnBack(NULL), @@ -545,6 +543,15 @@ void LLNavigationBar::clearHistoryCache() mPurgeTPHistoryItems= true; } +int LLNavigationBar::getDefNavBarHeight() +{ + return mDefaultNbRect.getHeight(); +} +int LLNavigationBar::getDefFavBarHeight() +{ + return mDefaultFpRect.getHeight(); +} + void LLNavigationBar::showNavigationPanel(BOOL visible) { bool fpVisible = gSavedSettings.getBOOL("ShowNavbarFavoritesPanel"); |