diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-12-18 15:29:23 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-03-25 19:25:42 -0400 |
| commit | 1c62f52af83aa6e6684f5d1f496d8095c7ca321f (patch) | |
| tree | ea390008c54ffc6836bc3e2255996e1b2dbd0676 | |
| parent | 4a046b844bea9edd3edf22d4ae1325817c90b881 (diff) | |
DRTVWR-476: LLChannelManager depends on LLUI. Tell LLSingleton.
| -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(); } //-------------------------------------------------------------------------- |