From d72824c2b789b81b2bc0ae2c20012ca45d23a42d Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 8 Nov 2022 21:14:22 +0200 Subject: SL-18197 Bump inventory cache version Issue: release viewer saves materials as AT_UNKNOWN (255). When material viewer loads cache with materials saved as '255' instead of '57', material viewer doesn't know to update content and it casuses issues. Viewer eventally recovers, but it's simpler to drop cache in this case over trying to figure out if our unknown is a material (but may be cache should include asset type count to let viewer know when to double check unknowns). Also made 'legacy' materials folder's name localizable just in case. --- indra/newview/llinventorymodel.cpp | 2 +- indra/newview/skins/default/xui/en/strings.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index b5853ad9a3..7254015d64 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -73,7 +73,7 @@ // Increment this if the inventory contents change in a non-backwards-compatible way. // For viewer 2, the addition of link items makes a pre-viewer-2 cache incorrect. -const S32 LLInventoryModel::sCurrentInvCacheVersion = 2; +const S32 LLInventoryModel::sCurrentInvCacheVersion = 3; BOOL LLInventoryModel::sFirstTimeInViewer2 = TRUE; ///---------------------------------------------------------------------------- diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 9f183d137d..e7e1a24f5e 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2474,6 +2474,7 @@ If you continue to receive this message, please contact Second Life support for Received Items Merchant Outbox Settings + Materials Materials -- cgit v1.2.3