From 8298a1de685757c89abe72976f6b77f527475c7a Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Thu, 29 Oct 2009 17:47:09 +0200
Subject: Fixed normal bug EXT-1556(When the Navbar and Favbar are switched
 off, floaters still cannot be moved into the space they previously occupied)

--HG--
branch : product-engine
---
 indra/newview/llnavigationbar.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llnavigationbar.cpp')

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");
-- 
cgit v1.2.3