diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 2809988ba05e83846154a051fb95c75e9d7da3f8..3c5ac963f6c910d1fb7b0180ff6ed891adade7e9 100644 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -59,7 +59,7 @@ LLFilePicker LLFilePicker::sInstance; #define XML_FILTER L"XML files (*.xml)\0*.xml\0" #define SLOBJECT_FILTER L"Objects (*.slobject)\0*.slobject\0" #define RAW_FILTER L"RAW files (*.raw)\0*.raw\0" -#define MODEL_FILTER L"Model files (*.dae; *.gltf; *.glb)\0*.dae;*.gltf;*.glb\0" +#define MODEL_FILTER L"Model files (*.dae)\0*.dae\0" #define MATERIAL_FILTER L"GLTF Files (*.gltf; *.glb)\0*.gltf;*.glb\0" #define SCRIPT_FILTER L"Script files (*.lsl)\0*.lsl\0" #define DICTIONARY_FILTER L"Dictionary files (*.dic; *.xcu)\0*.dic;*.xcu\0" diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index 5a0c23d59ba8f827bf771171c48c00ca8a7c4b8d..8b4d3b832b3426204b8092f899a82bc5b4fd79ce 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -280,7 +280,7 @@ class LLMaterialFilePicker : public LLFilePickerThread }; LLMaterialFilePicker::LLMaterialFilePicker(LLMaterialEditor* me) - : LLFilePickerThread(LLFilePicker::FFLOAD_MODEL) + : LLFilePickerThread(LLFilePicker::FFLOAD_MATERIAL) { mME = me; } @@ -325,6 +325,7 @@ static LLViewerFetchedTexture* get_texture(const std::string& folder, const tiny image->component <= 4) { LLPointer<LLImageRaw> rawImage = new LLImageRaw(&image->image[0], image->width, image->height, image->component); + rawImage->verticalFlip(); ret = LLViewerTextureManager::getFetchedTexture(rawImage, FTType::FTT_LOCAL_FILE, true); @@ -449,6 +450,8 @@ void LLMaterialFilePicker::loadMaterial(const std::string& filename) mME->setDoubleSided(material_in.doubleSided); mME->openFloater(); + + mME->applyToSelection(); } void LLMaterialEditor::importMaterial() @@ -484,5 +487,7 @@ void LLMaterialEditor::applyToSelection() vobjp->getTE(i)->setGLTFMaterial(mat); vobjp->updateTEMaterialTextures(i); } + + vobjp->markForUpdate(TRUE); } }