diff --git a/indra/llmessage/llcoproceduremanager.cpp b/indra/llmessage/llcoproceduremanager.cpp index 3abfd8b422..5b9894585a 100644 --- a/indra/llmessage/llcoproceduremanager.cpp +++ b/indra/llmessage/llcoproceduremanager.cpp @@ -415,6 +415,14 @@ void LLCoprocedurePool::coprocedureInvokerCoro( { coproc->mProc(httpAdapter, coproc->mId); } + catch (const LLCoros::Stop &) + { + LL_INFOS("CoProcMgr") << "Viewer is shutting Down. Stopping coprocedure('" << coproc->mName + << "', id=" << coproc->mId.asString() + << ") in pool '" << mPoolName << "'" << LL_ENDL; + mActiveCoprocs.erase(itActive); + throw; // let toplevel handle this as LLContinueError + } catch (...) { LOG_UNHANDLED_EXCEPTION(STRINGIZE("Coprocedure('" << coproc->mName diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index fe5fc195d2..d23ad905b8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -22707,17 +22707,6 @@ Change of this parameter will affect the layout of buttons in notification toast Value 0 - UseHTTPBakedTextureFetch - - Comment - If true, baked avatar textures will be fetched using HTTP instead of UDP. - Persist - 1 - Type - Boolean - Value - 0 - FSIMTabNameFormat Comment diff --git a/indra/newview/exogroupmutelist.cpp b/indra/newview/exogroupmutelist.cpp index eb18c8a1bf..b8d6882355 100644 --- a/indra/newview/exogroupmutelist.cpp +++ b/indra/newview/exogroupmutelist.cpp @@ -167,16 +167,29 @@ bool exoGroupMuteList::restoreDeferredGroupChat(const LLUUID& group) LLGroupData groupData; if (gAgent.getGroupData(group, groupData)) { - gIMMgr->addSession(groupData.mName, IM_SESSION_INVITE, group); - - uuid_vec_t ids; - LLIMModel::sendStartSession(group, group, ids, IM_SESSION_GROUP_START); - - if (!gAgent.isDoNotDisturb() && gSavedSettings.getU32("PlayModeUISndNewIncomingGroupIMSession") != 0) + if (!isMuted(group)) { - make_ui_sound("UISndNewIncomingGroupIMSession"); + LL_INFOS() << "Restoring group chat from " << groupData.mName << " (" << group.asString() << ")" << LL_ENDL; + + gIMMgr->addSession(groupData.mName, IM_SESSION_INVITE, group); + + uuid_vec_t ids; + LLIMModel::sendStartSession(group, group, ids, IM_SESSION_GROUP_START); + + if (!gAgent.isDoNotDisturb() && gSavedSettings.getU32("PlayModeUISndNewIncomingGroupIMSession") != 0) + { + make_ui_sound("UISndNewIncomingGroupIMSession"); + } + return true; + } + else + { + LL_INFOS() << "NOT restoring group chat from " << groupData.mName << " (" << group.asString() << ") because the group is muted" << LL_ENDL; + gIMMgr->clearPendingInvitation(group); + gIMMgr->clearPendingAgentListUpdates(group); + LLIMModel::getInstance()->sendLeaveSession(group, group); + return false; } - return true; } } diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 95bab7fd2d..1f4b2e883e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -955,7 +955,7 @@ bool LLAppViewer::init() LLFile::remove(per_user_dir_glob + "filters.xml"); LLFile::remove(per_user_dir_glob + "medialist.xml"); LLFile::remove(per_user_dir_glob + "plugin_cookies.xml"); - LLFile::remove(per_user_dir_glob + "screen_last.bmp"); + LLFile::remove(per_user_dir_glob + "screen_last*.*"); LLFile::remove(per_user_dir_glob + "search_history.xml"); LLFile::remove(per_user_dir_glob + "settings_friends_groups.xml"); LLFile::remove(per_user_dir_glob + "settings_per_account.xml"); diff --git a/indra/newview/llfloaterconversationpreview.cpp b/indra/newview/llfloaterconversationpreview.cpp index aa06963fc6..3ea64a30c4 100644 --- a/indra/newview/llfloaterconversationpreview.cpp +++ b/indra/newview/llfloaterconversationpreview.cpp @@ -101,7 +101,6 @@ BOOL LLFloaterConversationPreview::postBuild() name = LLTrans::getString("NearbyChatTitle"); file = "chat"; } - // Remember used log file name mChatHistoryFileName = file; LLStringUtil::format_map_t args; diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 8f0a195951..d324712a5e 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -3012,7 +3012,7 @@ void LLIMMgr::addMessage( // session id, so we can leave it! if (is_group_chat && !exoGroupMuteList::instance().isLoaded()) { - LL_INFOS() << "Received group chat from " << fixed_session_name << " (" << new_session_id.asString() << ") before must list has been loaded - skipping message" << LL_ENDL; + LL_INFOS() << "Received group chat from " << fixed_session_name << " (" << new_session_id.asString() << ") before mute list has been loaded - skipping message" << LL_ENDL; exoGroupMuteList::instance().addDeferredGroupChat(new_session_id); return; } @@ -3039,7 +3039,7 @@ void LLIMMgr::addMessage( if (IM_NOTHING_SPECIAL != dialog && IM_SESSION_P2P_INVITE != dialog && gAgent.isInGroup(new_session_id) && LLMuteList::getInstance()->isMuted(other_participant_id) && !from_linden) { - LL_INFOS() << "Ignoring group chat initiated by muted resident." << LL_ENDL; + LL_INFOS() << "Ignoring group chat from " << fixed_session_name << " (" << new_session_id.asString() << ") initiated by muted resident." << LL_ENDL; exoGroupMuteList::instance().addDeferredGroupChat(new_session_id); return; } diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index c3717884c4..edb5310ba5 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -205,7 +205,7 @@ https://accounts.secondlife.com/change_email/ diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml index 8a745f7f2a..25e6b5697c 100644 --- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml @@ -15,8 +15,7 @@ - Taille: -[DIMENSIONS] + Taille: [DIMENSIONS]