diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-07-29 07:07:29 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-07-29 07:07:29 +0800 |
| commit | cb759bf9e0580b0c0799e33b8e7af1ea46a4c336 (patch) | |
| tree | 403de432ee5431fdb5195cb21d81b1c0a01cec54 /indra/newview/gltf | |
| parent | 2ec9d7fa779456112f36e963d1e169a71149662a (diff) | |
| parent | 288bce100d1239dd98e1d0730c905cc5cbe6ad1b (diff) | |
Merge tag 'Second_Life_Release#288bce10-2025.05' into 2025.05
Diffstat (limited to 'indra/newview/gltf')
| -rw-r--r-- | indra/newview/gltf/llgltfloader.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/gltf/llgltfloader.cpp b/indra/newview/gltf/llgltfloader.cpp index 3019a12446..950e98c96d 100644 --- a/indra/newview/gltf/llgltfloader.cpp +++ b/indra/newview/gltf/llgltfloader.cpp @@ -59,6 +59,7 @@ #include <boost/regex.hpp> #include <boost/algorithm/string/replace.hpp> +#include <boost/exception/diagnostic_information.hpp> #include <fstream> static const std::string lod_suffix[LLModel::NUM_LODS] = @@ -154,7 +155,7 @@ bool LLGLTFLoader::OpenFile(const std::string &filename) LLSD args; args["Message"] = "ParsingErrorException"; args["FILENAME"] = filename; - args["EXCEPTION"] = "Unknown exception"; + args["EXCEPTION"] = boost::current_exception_diagnostic_information(); mWarningsArray.append(args); setLoadState(ERROR_PARSING); return false; @@ -611,6 +612,7 @@ LLGLTFLoader::LLGLTFImportMaterial LLGLTFLoader::processMaterial(S32 material_in LL::GLTF::Image& image = mGLTFAsset.mImages[sourceIndex]; if (image.mTexture.notNull()) { + mTexturesNeedScaling |= image.mHeight > LLViewerTexture::MAX_IMAGE_SIZE_DEFAULT || image.mWidth > LLViewerTexture::MAX_IMAGE_SIZE_DEFAULT; impMat.setDiffuseMap(image.mTexture->getID()); LL_INFOS("GLTF_IMPORT") << "Using existing texture ID: " << image.mTexture->getID().asString() << LL_ENDL; } |