From 9d33a686ecce94e1d2d8963958f82e9b470b2804 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Fri, 22 Dec 2023 00:28:47 -0500
Subject: [PATCH] Tweaks and fixes
---
indra/newview/llmaterialeditor.cpp | 2 +-
indra/newview/skins/default/xui/en/notifications.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index cddede03df8..6c1f1d7f71d 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -1874,7 +1874,7 @@ static void pack_textures(
if (normal_img)
{
// create a losslessly compressed version of the normal map
- normal_j2c = LLViewerTextureList::convertToUploadFile(normal_img, 1024, false, true);
+ normal_j2c = LLViewerTextureList::convertToUploadFile(normal_img, LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT, false, true);
LL_DEBUGS("MaterialEditor") << "Normal: " << normal_j2c->getDataSize() << LL_ENDL;
}
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0a8634c05c5..dd77fea6450 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9163,7 +9163,7 @@ Select residents to share with.
icon="alert.tga"
type="alert">
[LABEL] failed to upload: [MESSAGE]
-[DETAILS]See SecondLife.log for details
+[DETAILS]See Alchemy.log for details
</notification>
<notification
@@ -9172,7 +9172,7 @@ Select residents to share with.
type="alert">
[LABEL] failed to upload: [MESSAGE]
-See SecondLife.log for details
+See Alchemy.log for details
</notification>
<notification
--
GitLab