livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DRTVWR-476: LLChannelManager depends on LLUI. Tell LLSingleton.

meow-7.2.2
Nat Goodspeed 2019-12-18 15:29:23 -05:00
parent 4a046b844b
commit 1c62f52af8
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llchannelmanager.cpp
View File

@ -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();
}
//--------------------------------------------------------------------------