diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-14 17:36:17 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-14 17:36:17 -0500 |
| commit | d9d9edfa6dafa137d1c69c476872d74d33c06771 (patch) | |
| tree | ca958f938c2ad6c0f09f37f3b15f5ae2b7e9c7a6 /indra/newview/llstartup.cpp | |
| parent | f6762c3de57434730a2cbf6d0241bf1db5c9346c (diff) | |
| parent | 531d38ba1d030d85ec12e1206b3de3c6cb082a9a (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 6aca701fe2..64dd3af223 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -60,6 +60,7 @@ #include "llfloatergridstatus.h" #include "llfloaterimsession.h" #include "lllocationhistory.h" +#include "llgltfmateriallist.h" #include "llimageworker.h" #include "llloginflags.h" @@ -1473,6 +1474,9 @@ bool idle_startup() gXferManager->registerCallbacks(gMessageSystem); display_startup(); + LLGLTFMaterialList::registerCallbacks(); + display_startup(); + LLStartUp::initNameCache(); display_startup(); |