From a1cfce861ad949cec561d8dbf3d296f8847aa8a6 Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Fri, 19 Feb 2010 15:08:28 +0200 Subject: Partial fix for major bug EXT-5524 (Crash in LLVoiceClient when quitting viewer without login). - Used call of LLVoiceClient::instanceExists() instead of gVoiceClient in check in LLVoiceChannel destructor to avoid crash when quitting viewer by closing console window before login. So now crash won't happen in LLVoiceClient::removeObserver(). But crash will occur in other destructors later, so further investigation needed. --HG-- branch : product-engine --- indra/newview/llvoicechannel.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview') 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); } -- cgit v1.2.3 From 68889347efadcc6b093ac944fb813f57bff9fe5e Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Fri, 19 Feb 2010 15:11:02 +0200 Subject: Fixed normal bug EXT-5488(After login to specific region, next startup shows location box empty preventing login) --HG-- branch : product-engine --- indra/newview/llpanellogin.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview') 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()) -- cgit v1.2.3 From eefbb2a7b880943b71f8af4f7b91727836162ccf Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Fri, 19 Feb 2010 15:11:02 +0200 Subject: Fixed low bug EXT-4676 (Sell Land: Tab does not move to next control) --HG-- branch : product-engine --- indra/newview/llfloatersellland.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview') 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("profile_scroll")->setTabStop(true); return TRUE; } -- cgit v1.2.3 From 22676e6d38fe938f394a9764b226793b5862768c Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Fri, 19 Feb 2010 15:44:18 +0200 Subject: EXT-2891 "Group notices should be recorded into group IM history", corrected logging of stub group notices; --HG-- branch : product-engine --- indra/newview/llnotificationhandlerutil.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview') 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; -- cgit v1.2.3