diff options
Diffstat (limited to 'indra/newview/llmaterialeditor.h')
| -rw-r--r-- | indra/newview/llmaterialeditor.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h index c6b976ea5a..4e17cee154 100644 --- a/indra/newview/llmaterialeditor.h +++ b/indra/newview/llmaterialeditor.h @@ -101,7 +101,9 @@ public: void setFromGLTFMaterial(LLGLTFMaterial* mat); void loadAsset() override; - void loadMaterialFromFile(const std::string& filename); + // @index if -1 and file contains more than one material, + // will promt to select specific one + static void loadMaterialFromFile(const std::string& filename, S32 index = -1); static void onLoadComplete(const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status); |