merge

--HG--
branch : product-engine

4 files changed, 7 insertions, 1 deletions

diff --git a/indra/newview/llfloatersellland.cpp b/indra/newview/llfloatersellland.cpp
index 9895665026..eae6121e79 100644
--- a/indra/newview/llfloatersellland.cpp
+++ b/indra/newview/llfloatersellland.cpp
@@ -170,6 +170,7 @@ BOOL LLFloaterSellLandUI::postBuild()
 	childSetAction("sell_btn", doSellLand, this);
 	childSetAction("show_objects", doShowObjects, this);
 	center();
+	getChild<LLUICtrl>("profile_scroll")->setTabStop(true);
 	return TRUE;
 }
 
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index aefbe9a3de..9de9998cbd 100644
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -204,6 +204,7 @@ void LLHandlerUtil::logGroupNoticeToIMGroup(
 		llwarns
 						<< "Group notice for unkown group: "
 								<< payload["group_id"].asUUID() << llendl;
+		return;
 	}
 
 	const std::string group_name = groupData.mName;
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 43f4024bac..7bd03167fd 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -232,6 +232,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 	if(sim_string.empty())
 	{
 		LLURLSimString::setString(gSavedSettings.getString("LoginLocation"));
+		sim_string = LLURLSimString::sInstance.mSimString;
 	}
 
 	if (!sim_string.empty())
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp
index dfd67d0c38..fac7fa6a18 100644
--- a/indra/newview/llvoicechannel.cpp
+++ b/indra/newview/llvoicechannel.cpp
@@ -140,7 +140,10 @@ LLVoiceChannel::LLVoiceChannel(const LLUUID& session_id, const std::string& sess
 LLVoiceChannel::~LLVoiceChannel()
 {
 	// Don't use LLVoiceClient::getInstance() here -- this can get called during atexit() time and that singleton MAY have already been destroyed.
-	if(gVoiceClient)
+	// Using call of instanceExists() instead of gVoiceClient in check to avoid crash in LLVoiceClient::removeObserver() 
+	// when quitting viewer by closing console window before login (though in case of such quit crash will occur 
+	// later in other destructors anyway). EXT-5524
+	if(LLVoiceClient::instanceExists())
 	{
 		gVoiceClient->removeObserver(this);
 	}