Merge

1 files changed, 1 insertions, 6 deletions

diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 758d8ff903..98ca339f0c 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -810,13 +810,8 @@ void LLLocationInputCtrl::updateWidgetlayout()
 {
 	const LLRect&	rect			= getLocalRect();
 	const LLRect&	hist_btn_rect	= mButton->getRect();
-	LLRect			info_btn_rect	= mInfoBtn->getRect();
 
-	// info button
-	info_btn_rect.setOriginAndSize(
-		2, (rect.getHeight() - info_btn_rect.getHeight()) / 2,
-		info_btn_rect.getWidth(), info_btn_rect.getHeight());
-	mInfoBtn->setRect(info_btn_rect);
+	// Info button is set in the XUI XML location_input.xml
 
 	// "Add Landmark" button
 	LLRect al_btn_rect = mAddLandmarkBtn->getRect();