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)

3 files changed, 8 insertions, 71 deletions

diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index 133168f0ba..4c0823874c 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -269,7 +269,6 @@ LLNavigationBar::LLNavigationBar()
 	mBtnForward(NULL),
 	mBtnHome(NULL),
 	mCmbLocation(NULL),
-	mSearchComboBox(NULL),
 	mPurgeTPHistoryItems(false),
 	mSaveToLocationHistory(false)
 {
@@ -291,10 +290,7 @@ BOOL LLNavigationBar::postBuild()
 	mBtnForward	= getChild<LLPullButton>("forward_btn");
 	mBtnHome	= getChild<LLButton>("home_btn");
 	
-	mCmbLocation= getChild<LLLocationInputCtrl>("location_combo"); 
-	mSearchComboBox	= getChild<LLSearchComboBox>("search_combo_box");
-
-	fillSearchComboBox();
+	mCmbLocation= getChild<LLLocationInputCtrl>("location_combo");
 
 	mBtnBack->setEnabled(FALSE);
 	mBtnBack->setClickedCallback(boost::bind(&LLNavigationBar::onBackButtonClicked, this));
@@ -309,8 +305,6 @@ BOOL LLNavigationBar::postBuild()
 	mBtnHome->setClickedCallback(boost::bind(&LLNavigationBar::onHomeButtonClicked, this));
 
 	mCmbLocation->setCommitCallback(boost::bind(&LLNavigationBar::onLocationSelection, this));
-	
-	mSearchComboBox->setCommitCallback(boost::bind(&LLNavigationBar::onSearchCommit, this));
 
 	mTeleportFinishConnection = LLViewerParcelMgr::getInstance()->
 		setTeleportFinishedCallback(boost::bind(&LLNavigationBar::onTeleportFinished, this, _1));
@@ -344,26 +338,6 @@ void LLNavigationBar::setVisible(BOOL visible)
 	}
 }
 
-
-void LLNavigationBar::fillSearchComboBox()
-{
-	if(!mSearchComboBox)
-	{
-		return;
-	}
-
-	LLSearchHistory::getInstance()->load();
-
-	LLSearchHistory::search_history_list_t search_list = 
-		LLSearchHistory::getInstance()->getSearchHistoryList();
-	LLSearchHistory::search_history_list_t::const_iterator it = search_list.begin();
-	for( ; search_list.end() != it; ++it)
-	{
-		LLSearchHistory::LLSearchHistoryItem item = *it;
-		mSearchComboBox->add(item.search_query);
-	}
-}
-
 void LLNavigationBar::draw()
 {
 	if(mPurgeTPHistoryItems)
@@ -416,16 +390,6 @@ void LLNavigationBar::onHomeButtonClicked()
 	gAgent.teleportHome();
 }
 
-void LLNavigationBar::onSearchCommit()
-{
-	std::string search_query = mSearchComboBox->getSimple();
-	if(!search_query.empty())
-	{
-		LLSearchHistory::getInstance()->addEntry(search_query);
-	}
-	invokeSearch(search_query);	
-}
-
 void LLNavigationBar::onTeleportHistoryMenuItemClicked(const LLSD& userdata)
 {
 	int idx = userdata.asInteger();
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;
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 54befa38e9..719d3531ed 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -60,9 +60,9 @@
            layout="topleft"
            auto_resize="true"
            user_resize="true"
-           min_width="500"
+           min_width="340"
            name="navigation_layout_panel"
-           width="500">
+           width="340">
              <panel
                background_visible="false"
                follows="left|top|right"
@@ -71,7 +71,7 @@
                layout="topleft"
                left="0"
                name="navigation_panel"
-               width="500">
+               width="340">
                  <pull_button
                    follows="left|top"
                    direction="down"
@@ -118,33 +118,10 @@
                    mouse_opaque="false"
                    name="location_combo"
                    top_delta="0"
-                   width="213">
+                   width="215">
                  <combo_list
                    mouse_wheel_opaque="true"/>
                  </location_input>
-                 <search_combo_box
-                   follows="top|right"
-                   halign="right"
-                   height="23"
-                   label="Search"
-                   layout="topleft"
-                   left_pad="7"
-                   mouse_opaque="false"
-                   name="search_combo_box"
-                   tool_tip="Search"
-                   top_delta="0"
-                   width="152" >
-                     <combo_editor
-                       label="Search [SECOND_LIFE]"
-                       name="search_combo_editor"/>
-                     <combo_list
-                       draw_border="true"
-                       border.highlight_light_color="FocusColor"
-                       border.highlight_dark_color="FocusColor"
-                       border.shadow_light_color="FocusColor"
-                       border.shadow_dark_color="FocusColor"
-                       mouse_wheel_opaque="true"/>
-                 </search_combo_box>
              </panel>
          </layout_panel>
          
@@ -172,9 +149,9 @@
            layout="topleft"
            auto_resize="true"
            user_resize="true"
-           min_width="190"
+           min_width="335"
            name="favorites_layout_panel"
-           width="290">
+           width="335">
              <favorites_bar
                follows="left|right|top"
                font="SansSerifSmall"
@@ -184,7 +161,7 @@
                name="favorite"
                image_drag_indication="Accordion_ArrowOpened_Off"
                tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
-               width="290">
+               width="331">
                  <label
                    follows="left|top"
                    height="15"