diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-27 10:13:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-27 10:13:05 +0200 |
| commit | bcb5210f6b51b65174425849fbe4cbc53e424c8d (patch) | |
| tree | 04420f59b47894d7945a44d995b72d6badb1c02c /indra/newview/llstartup.cpp | |
| parent | f25f51a20a7bcefcf51de5e71f827c74c659571a (diff) | |
| parent | ccefd2f719e97c353dd85b51098a29786924190c (diff) | |
Merge pull request #1063 from secondlife/marchcat/b-merge
Merge main into maint B
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index d0b76848f7..8681bf6e2a 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1511,9 +1511,6 @@ bool idle_startup() gXferManager->registerCallbacks(gMessageSystem); display_startup(); - LLGLTFMaterialList::registerCallbacks(); - display_startup(); - LLStartUp::initNameCache(); display_startup(); |