diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-27 10:12:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-27 10:12:53 +0200 |
| commit | 16e638db975278f6018fe1e21ba1954b7f159149 (patch) | |
| tree | 876030bddc3b9e6cd885f829fb4a071aea309508 /indra/newview/llstartup.cpp | |
| parent | f815b015cecda18098dd2d16f65682a37e1bff7c (diff) | |
| parent | 990c8b81dad8bd0580c2c48f77e99b3ac53e581e (diff) | |
Merge pull request #1062 from secondlife/marchcat/yz-merge
Merge main into maint YZ
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(); |