summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-11-03 23:31:47 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-12-03 00:24:04 +0200
commit7ceb266604de07ca6743dcd1077b675dea39f1d9 (patch)
tree317ffe82957c03241a5b90f15fb08a23544d0e47 /indra/newview/llstartup.cpp
parent598e33e2e880388a457a496bea5b5d25bdf2aa28 (diff)
SL-18565 Built-in bump maps and some environment textures fail to load
Due to udp texture fetching no longer being present
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 862db08e62..325ab1e224 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1435,6 +1435,9 @@ bool idle_startup()
// to hapen with caps granted
gTextureList.doPrefetchImages();
+ // will init images, should be done with caps, but before gSky.init()
+ LLEnvironment::getInstance()->initSingleton();
+
display_startup();
update_texture_fetch();
display_startup();
@@ -2918,6 +2921,7 @@ void reset_login()
gAgentWearables.cleanup();
gAgentCamera.cleanup();
gAgent.cleanup();
+ gSky.cleanup(); // mVOSkyp is an inworld object.
LLWorld::getInstance()->resetClass();
if ( gViewerWindow )