From ad533fcd6b1a3433273fa6d75e19a7ce56c75867 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Tue, 14 Jun 2022 23:39:11 -0500 Subject: SL-17586 WIP -- LLMaterialEditor prototype and "New Material" inventory buttons. --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index acb3a720b9..0866f29355 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3835,6 +3835,7 @@ Abuse Report New Physics Invalid Wearable New Gesture + New Material New Script New Note New Folder -- cgit v1.2.3 From 33116b8adac6eec07c5badc08d7d66ca1283686a Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Fri, 24 Jun 2022 14:09:25 +0300 Subject: SL-17650 Add Material as a filter option to Inventory filter floater --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 0866f29355..e1678f418f 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2414,6 +2414,7 @@ If you continue to receive this message, please contact Second Life support for + -- cgit v1.2.3 From 81979e4b491b252d2e3af2e077d3f335aee02f7e Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 11 Jul 2022 21:46:34 +0300 Subject: SL-17640 Fixed missing asset string --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e89e03dafa..4169929be8 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -405,6 +405,7 @@ http://secondlife.com/support for help fixing this problem. link folder link settings + material mesh -- cgit v1.2.3 From 3b416b3e98fe80b1d9b26352551e2d5860016b78 Mon Sep 17 00:00:00 2001 From: Callum Linden Date: Mon, 8 Aug 2022 16:40:25 -0700 Subject: SL-17695 Give materials and textures imported by Material Editor a sensible name - first pass - likely need to be refined but may be good enough for now --- indra/newview/skins/default/xui/en/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 4169929be8..4b094da805 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -4264,6 +4264,9 @@ name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image Sit Environment + + Textures present this material: + Conversations are not being logged. To begin keeping a log, choose "Save: Log only" or "Save: Log and transcripts" under Preferences > Chat. -- cgit v1.2.3 From 2c15c87caad8f58c1cbfef5dfe97937a1c819a73 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 15 Sep 2022 22:16:38 +0300 Subject: SL-18161 Fix missing folder name localizations --- indra/newview/skins/default/xui/en/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 960faabcfd..7f2a2afd26 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2467,6 +2467,8 @@ If you continue to receive this message, please contact Second Life support for Meshes Received Items Merchant Outbox + Settings + Material Friends -- cgit v1.2.3 From c5dd5a0e49d08d106d28d872ce681430820585a7 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 16 Sep 2022 00:33:25 +0300 Subject: SL-18161 Change pbr folder name --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 7f2a2afd26..646f4af5d1 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2468,7 +2468,7 @@ If you continue to receive this message, please contact Second Life support for Received Items Merchant Outbox Settings - Material + Materials Friends -- cgit v1.2.3 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/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') 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 From c0f598c10376f12310660a729f4a763dbf46368e Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 1 Dec 2022 06:42:10 +0200 Subject: SL-18725 Texture picker should explain why dropping texture isn't allowed Show a tooltip on drag&drop --- indra/newview/skins/default/xui/en/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e7e1a24f5e..255aff06be 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -319,6 +319,11 @@ Only items with unrestricted 'next owner' permissions can be attached to notecards. + +Only textures with unrestricted +copy and transfer permissions +are allowed. + Searching... -- cgit v1.2.3 From 95de63eaa3bab44dc435d1448d0732d6ffe13544 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 8 Feb 2023 11:10:15 -0600 Subject: DRTVWR-559 Remove some 32-bit color paranoia checks (potential fix for running under wine) --- indra/newview/skins/default/xui/en/strings.xml | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 7177cb1273..67ea085c55 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3005,16 +3005,6 @@ Running in window. Can't make GL device context Can't find suitable pixel format Can't get pixel format description - - [APP_NAME] requires True Color (32-bit) to run. -Please go to your computer's display settings and set the color mode to 32-bit. - - - [APP_NAME] is unable to run because it can't get an 8 bit alpha channel. Usually this is due to video card driver issues. -Please make sure you have the latest video card drivers installed. -Also be sure your monitor is set to True Color (32-bit) in Control Panels > Display > Settings. -If you continue to receive this message, contact the [SUPPORT_SITE]. - Can't set pixel format Can't create GL rendering context Can't activate GL rendering context -- cgit v1.2.3