summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-04-03 16:02:48 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-04-03 16:02:48 -0400
commit276f95e67ee10cbadee899c845c385cadcaa8292 (patch)
tree01cb39fcdfaadb62d665b63b8bd35b1f4487c208 /indra/newview/llstartup.cpp
parentd2ed30f82367ae875d2b894e55118867e40239e9 (diff)
parent9567393f803dfb0c786b8e917e41c8f4b8b22af7 (diff)
Merge branch 'main' into release/luau-scripting.
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 6c5a8fab8c..7dfee3ca4f 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1512,9 +1512,6 @@ bool idle_startup()
gXferManager->registerCallbacks(gMessageSystem);
display_startup();
- LLGLTFMaterialList::registerCallbacks();
- display_startup();
-
LLStartUp::initNameCache();
display_startup();