merge

--HG--
branch : product-engine

indra/newview/lllocationinputctrl.cpp

@@ -674,15 +674,6 @@ void LLLocationInputCtrl::onLocationPrearrange(const LLSD& data)
 									_1, filter));
 		}
 	}
-	if(mList->isEmpty())
-	{
-		/**
-		 * Add a couple of empty items for a better view.
-		 * EXT-5194 
-		 */
-		for(int i = 0; i < NUMBER_OF_EMPTY_ITEMS; i++ )
-			add("", LLSD());
-	}
 	sortByName();
 	
 	mList->mouseOverHighlightNthItem(-1); // Clear highlight on the last selected item.

indra/newview/lllocationinputctrl.h

@@ -120,13 +120,6 @@ private:
 		ICON_COUNT
 	};
 
-    /**
-     * This  constant holds number of empty dropdown items, which will be displayed  instead of doing nothing when the list is empty.
-     * Added due to EXT-5194 
-     */
-    static const S32 NUMBER_OF_EMPTY_ITEMS = 3;
-    
-
 	friend class LLUICtrlFactory;
 	LLLocationInputCtrl(const Params&);
 	virtual ~LLLocationInputCtrl();