diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-07-23 19:21:30 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-07-23 19:21:30 +0000 |
| commit | 6fbf39f9b319106e39f80b8641acaba122d02e0a (patch) | |
| tree | e47af1ff1bd1db52fd93c11d857b11387bacf01a /indra/newview/llchannelmanager.cpp | |
| parent | 05200cf827d9a6263adc4905bf41a4905bce2659 (diff) | |
| parent | 64a9ad0f5f52dac633a76e39335a7def2573b82e (diff) | |
Merged in lmr4-merge-6.4.6 (pull request #213)
Merge master v6.4.6 into DRTVWR-497 (VS2017)
Diffstat (limited to 'indra/newview/llchannelmanager.cpp')
| -rw-r--r-- | indra/newview/llchannelmanager.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp index 0b7b9cbbc7..9e7a8ba95c 100644 --- a/indra/newview/llchannelmanager.cpp +++ b/indra/newview/llchannelmanager.cpp @@ -48,11 +48,18 @@ LLChannelManager::LLChannelManager() LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&LLChannelManager::onLoginCompleted, this)); mChannelList.clear(); mStartUpChannel = NULL; - + if(!gViewerWindow) { LL_ERRS() << "LLChannelManager::LLChannelManager() - viwer window is not initialized yet" << LL_ENDL; } + + // We don't actually need this instance right now, but our + // cleanupSingleton() method deletes LLScreenChannels, which need to + // unregister from LLUI. Calling LLUI::instance() here establishes the + // dependency so LLSingletonBase::deleteAll() calls our deleteSingleton() + // before LLUI::deleteSingleton(). + LLUI::instance(); } //-------------------------------------------------------------------------- |