diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-04-01 13:10:33 -0400 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-04-01 13:10:33 -0400 |
| commit | ccdcbfeebd10a78cfb67f5324a3eb17a7d76604b (patch) | |
| tree | 9543eb9393ea9f20b3199c86c48a5b4fc5b3f5e1 /indra/newview/lllocalbitmaps.h | |
| parent | 497c309a5b148fd86a0e1429343092f0a6ca2e0d (diff) | |
| parent | 4ddd9d1fefc3b956e19ef25cfdd199fde352437a (diff) | |
Merge branch 'release/2025.03' into release/2025.04
Diffstat (limited to 'indra/newview/lllocalbitmaps.h')
| -rw-r--r-- | indra/newview/lllocalbitmaps.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllocalbitmaps.h b/indra/newview/lllocalbitmaps.h index 06770334e4..6c9d65e3b6 100644 --- a/indra/newview/lllocalbitmaps.h +++ b/indra/newview/lllocalbitmaps.h @@ -107,7 +107,7 @@ class LLLocalBitmap // Store a list of accosiated materials // Might be a better idea to hold this in LLGLTFMaterialList - typedef std::vector<LLPointer<LLGLTFMaterial> > mat_list_t; + typedef std::list<LLPointer<LLGLTFMaterial> > mat_list_t; mat_list_t mGLTFMaterialWithLocalTextures; }; |