Skip to content
Snippets Groups Projects
Commit 1c62f52a authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

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

parent 4a046b84
No related branches found
No related tags found
No related merge requests found
......@@ -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();
}
//--------------------------------------------------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment