1 files changed, 15 insertions, 14 deletions

diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 04c684b240..5f233bece0 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -473,6 +473,7 @@ BOOL LLLocationInputCtrl::handleKeyHere(KEY key, MASK mask)
 void LLLocationInputCtrl::onTextEntry(LLLineEditor* line_editor)
 {
 	KEY key = gKeyboard->currentKey();
+	MASK mask = gKeyboard->currentMask(TRUE);
 
 	if (line_editor->getText().empty())
 	{
@@ -480,7 +481,7 @@ void LLLocationInputCtrl::onTextEntry(LLLineEditor* line_editor)
 		hideList();
 	}
 	// Typing? (moving cursor should not affect showing the list)
-	else if (key != KEY_LEFT && key != KEY_RIGHT && key != KEY_HOME && key != KEY_END)
+	else if (mask != MASK_CONTROL && key != KEY_LEFT && key != KEY_RIGHT && key != KEY_HOME && key != KEY_END)
 	{
 		prearrangeList(line_editor->getText());
 		if (mList->getItemCount() != 0)
@@ -779,15 +780,19 @@ void LLLocationInputCtrl::refreshParcelIcons()
 	// Our "cursor" moving right to left
 	S32 x = mAddLandmarkBtn->getRect().mLeft;
 
-	if (gSavedSettings.getBOOL("NavBarShowParcelProperties"))
-	{
-		LLViewerParcelMgr* vpm = LLViewerParcelMgr::getInstance();
+	LLViewerParcelMgr* vpm = LLViewerParcelMgr::getInstance();
+
+	LLViewerRegion* agent_region = gAgent.getRegion();
+	LLParcel* agent_parcel = vpm->getAgentParcel();
+	if (!agent_region || !agent_parcel)
+		return;
+
+	mForSaleBtn->setVisible(vpm->canAgentBuyParcel(agent_parcel, false));
 
-		LLViewerRegion* agent_region = gAgent.getRegion();
-		LLParcel* agent_parcel = vpm->getAgentParcel();
-		if (!agent_region || !agent_parcel)
-			return;
+	x = layout_widget(mForSaleBtn, x);
 
+	if (gSavedSettings.getBOOL("NavBarShowParcelProperties"))
+	{
 		LLParcel* current_parcel;
 		LLViewerRegion* selection_region = vpm->getSelectionRegion();
 		LLParcel* selected_parcel = vpm->getParcelSelection()->getParcel();
@@ -807,7 +812,6 @@ void LLLocationInputCtrl::refreshParcelIcons()
 			current_parcel = agent_parcel;
 		}
 
-		bool allow_buy      = vpm->canAgentBuyParcel(current_parcel, false);
 		bool allow_voice	= vpm->allowAgentVoice(agent_region, current_parcel);
 		bool allow_fly		= vpm->allowAgentFly(agent_region, current_parcel);
 		bool allow_push		= vpm->allowAgentPush(agent_region, current_parcel);
@@ -816,7 +820,6 @@ void LLLocationInputCtrl::refreshParcelIcons()
 		bool allow_damage	= vpm->allowAgentDamage(agent_region, current_parcel);
 
 		// Most icons are "block this ability"
-		mForSaleBtn->setVisible(allow_buy);
 		mParcelIcon[VOICE_ICON]->setVisible(   !allow_voice );
 		mParcelIcon[FLY_ICON]->setVisible(     !allow_fly );
 		mParcelIcon[PUSH_ICON]->setVisible(    !allow_push );
@@ -824,11 +827,10 @@ void LLLocationInputCtrl::refreshParcelIcons()
 		mParcelIcon[SCRIPTS_ICON]->setVisible( !allow_scripts );
 		mParcelIcon[DAMAGE_ICON]->setVisible(  allow_damage );
 		mDamageText->setVisible(allow_damage);
-		
-		x = layout_widget(mForSaleBtn, x);
+
 		// Padding goes to left of both landmark star and for sale btn
 		x -= mAddLandmarkHPad;
-		
+
 		// Slide the parcel icons rect from right to left, adjusting rectangles
 		for (S32 i = 0; i < ICON_COUNT; ++i)
 		{
@@ -840,7 +842,6 @@ void LLLocationInputCtrl::refreshParcelIcons()
 	}
 	else
 	{
-		mForSaleBtn->setVisible(false);
 		for (S32 i = 0; i < ICON_COUNT; ++i)
 		{
 			mParcelIcon[i]->setVisible(false);