diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index cddede03df8220ccc975a643e3d0a3e20e1f702a..6c1f1d7f71dac246d974e1f764728ddf1d0de777 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 0a8634c05c592f86a10b1e4be0395080e75d5e73..dd77fea6450228a099af75ad0f1f0522171e9cf4 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