1 files changed, 19 insertions, 8 deletions
diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h
index 17a1438912..c533953a02 100644
--- a/indra/newview/llnavigationbar.h
+++ b/indra/newview/llnavigationbar.h
@@ -60,6 +60,9 @@ public:
 
 	void handleLoginComplete();
 	void clearHistoryCache();
+
+	void showNavigationPanel(BOOL visible);
+	void showFavoritesPanel(BOOL visible);
 	
 private:
 	LLNavigationBar();
@@ -68,6 +71,9 @@ private:
 	void showTeleportHistoryMenu();
 	void invokeSearch(std::string search_text);
 
+	static void appendLocalCoordsToRegName(std::string* reg_name, S32 x, S32 y, S32 z);
+	static std::string extractLocalCoordsFromRegName(const std::string & reg_name, S32* x, S32* y, S32* z);
+
 	// callbacks
 	bool onLocationContextMenuItemEnabled(const LLSD& userdata);
 	void onLocationContextMenuItemClicked(const LLSD& userdata);
@@ -81,6 +87,7 @@ private:
 	void onLocationSelection();
 	void onLocationPrearrange(const LLSD& data);
 	void onSearchCommit();
+	void onTeleportFinished();
 	void onRegionNameResponse(
 			std::string typed_location,
 			std::string region_name,
@@ -90,14 +97,18 @@ private:
 
 	static LLNavigationBar *sInstance;
 	
-	LLMenuGL*				mLocationContextMenu;
-	LLMenuGL*				mTeleportHistoryMenu;
-	LLButton*				mBtnBack;
-	LLButton*				mBtnForward;
-	LLButton*				mBtnHome;
-	LLSearchEditor*			mLeSearch;
-	LLLocationInputCtrl*	mCmbLocation;
-	bool					mPurgeTPHistoryItems;
+	LLMenuGL*					mLocationContextMenu;
+	LLMenuGL*					mTeleportHistoryMenu;
+	LLButton*					mBtnBack;
+	LLButton*					mBtnForward;
+	LLButton*					mBtnHome;
+	LLSearchEditor*				mLeSearch;
+	LLLocationInputCtrl*		mCmbLocation;
+	LLRect						mDefaultNbRect;
+	LLRect						mDefaultFpRect;
+	boost::signals2::connection	mParcelMgrConnection;
+	bool						mPurgeTPHistoryItems;
+	bool						mUpdateTypedLocationHistory;
 };
 
 #endif