From 0bf00fcc9158247645551f4df6f23b9e3c381997 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Mon, 29 May 2017 11:30:07 +0300 Subject: [PATCH 1/5] MAINT-7443 FIXED Able to Block a user with Lastname Linden --- indra/newview/llmutelist.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp index 5c4f8d2951..9b0378b989 100644 --- a/indra/newview/llmutelist.cpp +++ b/indra/newview/llmutelist.cpp @@ -48,6 +48,7 @@ #include #include +#include #include "lldispatcher.h" #include "llxfermanager.h" @@ -183,9 +184,10 @@ LLMuteList::~LLMuteList() BOOL LLMuteList::isLinden(const std::string& name) const { + std::string username = boost::replace_all_copy(name, ".", " "); typedef boost::tokenizer > tokenizer; boost::char_separator sep(" "); - tokenizer tokens(name, sep); + tokenizer tokens(username, sep); tokenizer::iterator token_iter = tokens.begin(); if (token_iter == tokens.end()) return FALSE; @@ -193,7 +195,8 @@ BOOL LLMuteList::isLinden(const std::string& name) const if (token_iter == tokens.end()) return FALSE; std::string last_name = *token_iter; - return last_name == "Linden"; + LLStringUtil::toLower(last_name); + return last_name == "linden"; } static LLVOAvatar* find_avatar(const LLUUID& id) From c49330176f205094db19b5fdf291163cc6300d75 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Mon, 29 May 2017 17:53:20 +0300 Subject: [PATCH 2/5] MAINT-7438 FIXED Always allow 'create landmark' allows group teleport routing override, however was removed. --- indra/newview/skins/default/xui/en/role_actions.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml index 25004ca830..09d952e6c1 100644 --- a/indra/newview/skins/default/xui/en/role_actions.xml +++ b/indra/newview/skins/default/xui/en/role_actions.xml @@ -105,6 +105,9 @@ + From 645301633f1237d0b5db5b104f9868ccd77155c8 Mon Sep 17 00:00:00 2001 From: Cinder Date: Thu, 15 Dec 2016 09:34:04 -0600 Subject: [PATCH 3/5] STORM-2144 - Guard against null pointers when LLPanelOutfitEdit gets called before postBuild() on login. --- doc/contributions.txt | 1 + indra/newview/llpaneloutfitedit.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index 9f3e5bd544..46fff79706 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -369,6 +369,7 @@ Cinder Roxley STORM-2124 STORM-2127 STORM-2136 + STORM-2144 Clara Young Coaldust Numbers VWR-1095 diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index c0399b8700..580a7e1df0 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -1300,7 +1300,7 @@ void LLPanelOutfitEdit::showFilteredWearablesListView(LLWearableType::EType type showWearablesListView(); //e_list_view_item_type implicitly contains LLWearableType::EType starting from LVIT_SHAPE - applyListViewFilter((EListViewItemType) (LVIT_SHAPE + type)); + applyListViewFilter(static_cast(LVIT_SHAPE + type)); } static void update_status_widget_rect(LLView * widget, S32 right_border) @@ -1320,8 +1320,10 @@ void LLPanelOutfitEdit::onOutfitChanging(bool started) S32 delta = started ? indicator_delta : 0; S32 right_border = status_panel->getRect().getWidth() - delta; - update_status_widget_rect(mCurrentOutfitName, right_border); - update_status_widget_rect(mStatus, right_border); + if (mCurrentOutfitName) + update_status_widget_rect(mCurrentOutfitName, right_border); + if (mStatus) + update_status_widget_rect(mStatus, right_border); indicator->setVisible(started); } From c877206569da5c3c732f4274933f8f1d14b133aa Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Fri, 26 May 2017 15:11:37 +0300 Subject: [PATCH 4/5] MAINT-1139 Catch Windows crash on Saving snapshot --- indra/newview/llfilepicker.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 2b03e081ac..ffb6bd0a2d 100644 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -609,11 +609,18 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename, // { // NOTA BENE: hitting the file dialog triggers a window focus event, destroying the selection manager!! - success = GetSaveFileName(&mOFN); - if (success) + try { - std::string filename = utf16str_to_utf8str(llutf16string(mFilesW)); - mFiles.push_back(filename); + success = GetSaveFileName(&mOFN); + if (success) + { + std::string filename = utf16str_to_utf8str(llutf16string(mFilesW)); + mFiles.push_back(filename); + } + } + catch (...) + { + LOG_UNHANDLED_EXCEPTION(""); } gKeyboard->resetKeys(); } From 00027bb77d795fa01a841cb61a2524368cb30ee4 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 30 May 2017 22:32:05 +0200 Subject: [PATCH 5/5] Backed out changeset: 5d022ae9e79c --- indra/newview/skins/default/xui/de/role_actions.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/skins/default/xui/de/role_actions.xml b/indra/newview/skins/default/xui/de/role_actions.xml index fc005bf64a..43cfe62047 100644 --- a/indra/newview/skins/default/xui/de/role_actions.xml +++ b/indra/newview/skins/default/xui/de/role_actions.xml @@ -38,6 +38,7 @@ +