オフラインヘルプ

From 6586055320922b4219d382f24383b00e20387e03 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 29 May 2023 21:04:52 +0300 Subject: SL-19787 Crash at LLUIColor::operator --- indra/llui/lluicolortable.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp index b84bb13edb..096336045c 100644 --- a/indra/llui/lluicolortable.cpp +++ b/indra/llui/lluicolortable.cpp @@ -230,7 +230,7 @@ void LLUIColorTable::saveUserSettings() const { // Compare user color value with the default value, skip if equal string_color_map_t::const_iterator itd = mLoadedColors.find(it->first); - if(itd != mUserSetColors.end() && itd->second == it->second) + if(itd != mLoadedColors.end() && itd->second == it->second) continue; ColorEntryParams color_entry; -- cgit v1.2.3 From 5b9b4fcf6657ce2cfa5fde85012fe24213df37b5 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 29 May 2023 23:37:58 +0300 Subject: SL-17429 Message user when their inventory hits AIS2 limits --- indra/newview/llinventorymodelbackgroundfetch.cpp | 25 +++++++++++++++++++--- .../newview/skins/default/xui/en/notifications.xml | 8 +++++++ 2 files changed, 30 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp index 6b88d0aaf7..f544b318d6 100644 --- a/indra/newview/llinventorymodelbackgroundfetch.cpp +++ b/indra/newview/llinventorymodelbackgroundfetch.cpp @@ -30,8 +30,10 @@ #include "llagent.h" #include "llappviewer.h" #include "llcallbacklist.h" -#include "llinventorypanel.h" #include "llinventorymodel.h" +#include "llinventorypanel.h" +#include "llnotificationsutil.h" +#include "llstartup.h" #include "llviewercontrol.h" #include "llviewerinventory.h" #include "llviewermessage.h" @@ -802,12 +804,24 @@ void BGFolderHttpHandler::processFailure(LLCore::HttpStatus status, LLCore::Http if(status == LLCore::HttpStatus(HTTP_FORBIDDEN)) { - // too large, split into two, assume that this isn't the library + // Too large, split into two if possible + if (gDisconnected || LLApp::isExiting()) + { + return; + } + const std::string url(gAgent.getRegionCapability("FetchInventoryDescendents2")); + if (url.empty()) + { + LL_WARNS(LOG_INV) << "Failed to get AIS2 cap" << LL_ENDL; + return; + } + S32 size = mRequestSD["folders"].size(); - if (!gDisconnected && !LLApp::isExiting() && !url.empty() && size > 1) + if (size > 1) { + // Can split, assume that this isn't the library LLSD folders; uuid_vec_t recursive_cats; LLSD::array_iterator iter = mRequestSD["folders"].beginArray(); @@ -838,6 +852,11 @@ void BGFolderHttpHandler::processFailure(LLCore::HttpStatus status, LLCore::Http gInventory.requestPost(false, url, request_body, handler, "Inventory Folder"); return; } + else + { + // Can't split + LLNotificationsUtil::add("InventoryLimitReachedAIS"); + } } // This was originally the request retry logic for the inventory diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f9211600ea..a216ef7c0d 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6369,6 +6369,14 @@ Your trash is overflowing. This may cause problems logging in. yestext="Check trash folder"/> + +Your inventory is experiencing issues. Please, contact support. + fail + + Date: Tue, 30 May 2023 11:03:26 +0900 Subject: Removed unused Japanese translation *.xml files. --- .../skins/default/xui/ja/floater_chat_bar.xml | 7 ----- .../skins/default/xui/ja/floater_perm_prefs.xml | 16 ---------- .../default/xui/ja/floater_voice_controls.xml | 30 ------------------- .../default/xui/ja/menu_inspect_avatar_gear.xml | 21 ------------- .../default/xui/ja/menu_inspect_self_gear.xml | 31 ------------------- .../skins/default/xui/ja/menu_name_field.xml | 6 ---- .../xui/ja/menu_people_friends_view_sort.xml | 8 ----- .../xui/ja/menu_people_groups_view_sort.xml | 5 ---- .../xui/ja/menu_people_nearby_view_sort.xml | 9 ------ .../xui/ja/menu_people_recent_view_sort.xml | 7 ----- .../default/xui/ja/panel_adhoc_control_panel.xml | 14 --------- .../default/xui/ja/panel_facebook_account.xml | 15 ---------- .../default/xui/ja/panel_group_control_panel.xml | 17 ----------- .../default/xui/ja/panel_im_control_panel.xml | 30 ------------------- .../default/xui/ja/panel_profile_interests.xml | 35 ---------------------- 15 files changed, 251 deletions(-) delete mode 100644 indra/newview/skins/default/xui/ja/floater_chat_bar.xml delete mode 100644 indra/newview/skins/default/xui/ja/floater_perm_prefs.xml delete mode 100644 indra/newview/skins/default/xui/ja/floater_voice_controls.xml delete mode 100644 indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml delete mode 100644 indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml delete mode 100644 indra/newview/skins/default/xui/ja/menu_name_field.xml delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml delete mode 100644 indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml delete mode 100644 indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml delete mode 100644 indra/newview/skins/default/xui/ja/panel_facebook_account.xml delete mode 100644 indra/newview/skins/default/xui/ja/panel_group_control_panel.xml delete mode 100644 indra/newview/skins/default/xui/ja/panel_im_control_panel.xml delete mode 100644 indra/newview/skins/default/xui/ja/panel_profile_interests.xml (limited to 'indra') diff --git a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml b/indra/newview/skins/default/xui/ja/floater_chat_bar.xml deleted file mode 100644 index 9f5df6fb85..0000000000 --- a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - + + + + 名前タグ： + + + + + + + \ No newline at end of file diff --git a/indra/newview/skins/default/xui/ja/panel_performance_preferences.xml b/indra/newview/skins/default/xui/ja/panel_performance_preferences.xml new file mode 100644 index 0000000000..21dabb133c --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_performance_preferences.xml @@ -0,0 +1,66 @@ + + + + + + 0 + [https://community.secondlife.com/t5/Featured-News/Why-are-all-these-people-made-of-colored-jelly/ba-p/3031255 これはなんですか？] + + + + +