From ee9b689cb418bf10540b82b0be38e5bc1f8cb3b0 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 26 Jul 2011 06:49:33 +0200
Subject: [PATCH] OK, more login unbreaking =.=

---
 indra/newview/llpanellogin.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 4fbcf0187..1920750be 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -607,7 +607,7 @@ void LLPanelLogin::giveFocus()
 	if( sInstance )
 	{
 		// Grab focus and move cursor to first blank input field
-		std::string first = sInstance->childGetText("name_combo");
+		std::string first = sInstance->getChild<LLComboBox>("name_combo")->getTextEntry();
 		std::string pass = sInstance->childGetText("password_edit");
 
 		BOOL have_first = !first.empty();
@@ -1238,16 +1238,10 @@ void LLPanelLogin::onLoginComboLostFocus(LLFocusableElement* fe, void*)
 	if (sInstance)
 	{
 		LLComboBox* combo = sInstance->getChild<LLComboBox>("name_combo");
-		if(fe == combo)
+		if(fe == combo && combo->isTextDirty())
 		{
-			if (combo->isTextDirty())
-			{
-				clearPassword();
-			}
-			else
-			{
-				onSelectLoginEntry(combo, NULL);
-			}
+			clearPassword();
+			combo->resetTextDirty();
 		}
 	}
 }