diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-12-05 11:49:07 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-12-05 11:49:07 -0600 |
| commit | 3ec5110129ffd29d8e76eb82e31da7470e281503 (patch) | |
| tree | 72fd7f20285683f2031c7d82a31a88b2832d90ad /indra/newview/llstartup.cpp | |
| parent | 3c20f0b1d4dd7257dc608823d82b6f798c492b43 (diff) | |
| parent | 7ceb266604de07ca6743dcd1077b675dea39f1d9 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 4 |
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 ) |