summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-27 01:40:12 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-27 01:40:12 +0200
commit990c8b81dad8bd0580c2c48f77e99b3ac53e581e (patch)
tree876030bddc3b9e6cd885f829fb4a071aea309508 /indra/newview/llstartup.cpp
parentf815b015cecda18098dd2d16f65682a37e1bff7c (diff)
parent9567393f803dfb0c786b8e917e41c8f4b8b22af7 (diff)
Merge branch 'main' into marchcat/yz-merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp3
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();