diff options
| author | Howard Stearns <howard.stearns@gmail.com> | 2022-09-01 13:38:59 -0700 |
|---|---|---|
| committer | Howard Stearns <howard.stearns@gmail.com> | 2022-09-01 13:38:59 -0700 |
| commit | 3cf349c4fa1c1879babab23536baff8e4e5421fc (patch) | |
| tree | 61e6af4eb66a3ed754f14743bd08ece4dcdf6a30 /indra/newview/lllocalgltfmaterials.h | |
| parent | 01d03edd8512580575da515401a42021577c3c57 (diff) | |
| parent | d2d257cfa99b685160e16ed93c163018e9fe3c50 (diff) | |
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into SL-17967
Diffstat (limited to 'indra/newview/lllocalgltfmaterials.h')
| -rw-r--r-- | indra/newview/lllocalgltfmaterials.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/lllocalgltfmaterials.h b/indra/newview/lllocalgltfmaterials.h index 7f5b06e10a..1bca06ba2a 100644 --- a/indra/newview/lllocalgltfmaterials.h +++ b/indra/newview/lllocalgltfmaterials.h @@ -103,9 +103,8 @@ class LLLocalGLTFMaterialMgr : public LLSingleton<LLLocalGLTFMaterialMgr> LLSINGLETON(LLLocalGLTFMaterialMgr); ~LLLocalGLTFMaterialMgr(); public: - bool addUnit(); bool addUnit(const std::vector<std::string>& filenames); - bool addUnit(const std::string& filename); + LLUUID addUnit(const std::string& filename); void delUnit(LLUUID tracking_id); LLUUID getWorldID(LLUUID tracking_id); |