From 5baf0de6a396b120aba4e2351ed5bff70f2562ef Mon Sep 17 00:00:00 2001 From: Paul ProductEngine Date: Mon, 19 Sep 2011 19:13:39 +0300 Subject: EXP-1203 FIXED (As a FUI user, I want the address bar and favorites to be on one line) - Relocated address bar, combined with favorite landmarks EXP-1208 - Added dragger to change amount of space allocated to address bar and favorites bar EXP-1217 - Modified Favorites ->> More spillover EXP-1218 - Combined context menu menuitems for favorites & address bars EXP-1219 --- indra/newview/llnavigationbar.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'indra/newview/llnavigationbar.h') diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h index 3c9f8a762d..f200253de5 100644 --- a/indra/newview/llnavigationbar.h +++ b/indra/newview/llnavigationbar.h @@ -98,9 +98,6 @@ public: void handleLoginComplete(); void clearHistoryCache(); - void showNavigationPanel(BOOL visible); - void showFavoritesPanel(BOOL visible); - int getDefNavBarHeight(); int getDefFavBarHeight(); -- cgit v1.2.3 From 679a028fcc5615b9725bf11f6949634617fad06d Mon Sep 17 00:00:00 2001 From: Paul ProductEngine Date: Mon, 26 Sep 2011 20:37:02 +0300 Subject: EXP-1203 ADDITIONAL FIX (As a FUI user, I want the address bar and favorites to be on one line) - Removed search combobox by spec - Fixed EXP-1243 (Parcel characteristics icons from location bar overlay other ui elements) - Fixed EXP-1245 (More spillover list "jumps" on copying landmarks) --- indra/newview/llnavigationbar.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'indra/newview/llnavigationbar.h') diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h index f200253de5..e4ce9e3998 100644 --- a/indra/newview/llnavigationbar.h +++ b/indra/newview/llnavigationbar.h @@ -118,7 +118,6 @@ private: void onHomeButtonClicked(); void onLocationSelection(); void onLocationPrearrange(const LLSD& data); - void onSearchCommit(); void onTeleportFinished(const LLVector3d& global_agent_pos); void onTeleportFailed(); void onRegionNameResponse( @@ -128,8 +127,6 @@ private: U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport); - void fillSearchComboBox(); - static void destroyClass() { if (LLNavigationBar::instanceExists()) @@ -142,7 +139,6 @@ private: LLPullButton* mBtnBack; LLPullButton* mBtnForward; LLButton* mBtnHome; - LLSearchComboBox* mSearchComboBox; LLLocationInputCtrl* mCmbLocation; LLRect mDefaultNbRect; LLRect mDefaultFpRect; -- cgit v1.2.3