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

STORM-1286 - merge changes for SH-1624

meow-7.2.2
Debi King (Dessie) 2011-05-27 12:28:42 -04:00
parent ac9928918d fede6c4493
commit d64babaeeb
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llappviewer.cpp
View File

@ -739,6 +739,8 @@ bool LLAppViewer::init()
}
initThreads();
LL_INFOS("InitInfo") << "Threads initialized." << LL_ENDL ; ;
writeSystemInfo();
// Initialize updater service (now that we have an io pump)
@ -765,6 +767,10 @@ bool LLAppViewer::init()
LL_INFOS("InitInfo") << "J2C Engine is: " << LLImageJ2C::getEngineInfo() << LL_ENDL;
LL_INFOS("InitInfo") << "libcurl version is: " << LLCurl::getVersionString() << LL_ENDL;
//Note: --bao
//allow to start texture fetching, must be called after initThreads();
gTextureList.start() ;
// Get the single value from the crash settings file, if it exists
std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
gCrashSettings.loadFromFile(crash_settings_filename);
@ -773,6 +779,7 @@ bool LLAppViewer::init()
gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, CRASH_BEHAVIOR_ALWAYS_SEND);
gCrashSettings.saveToFile(crash_settings_filename, FALSE);
}
LL_INFOS("InitInfo") << "Crash settings done." << LL_ENDL ;
/////////////////////////////////////////////////
// OS-specific login dialogs
@ -821,6 +828,8 @@ bool LLAppViewer::init()
// Let code in llui access the viewer help floater
LLUI::sHelpImpl = LLViewerHelp::getInstance();
LL_INFOS("InitInfo") << "UI initialization is done." << LL_ENDL ;
// Load translations for tooltips
LLFloater::initClass();
@ -890,7 +899,8 @@ bool LLAppViewer::init()
OSMessageBox(msg.str(),LLStringUtil::null,OSMB_OK);
return 1;
}
LL_INFOS("InitInfo") << "Cache initialization is done." << LL_ENDL ;
// Initialize the repeater service.
LLMainLoopRepeater::instance().start();
@ -899,6 +909,7 @@ bool LLAppViewer::init()
//
gGLActive = TRUE;
initWindow();
LL_INFOS("InitInfo") << "Window is initialized." << LL_ENDL ;
// initWindow also initializes the Feature List, so now we can initialize this global.
LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap");

11
indra/newview/llviewertexturelist.cpp
View File

@ -88,15 +88,16 @@ LLViewerTextureList::LLViewerTextureList()
{
}
void LLViewerTextureList::init()
void LLViewerTextureList::start()
{
sRenderThreadID = LLThread::currentID() ;
mInitialized = TRUE ;
sNumImages = 0;
mMaxResidentTexMemInMegaBytes = 0;
mMaxTotalTextureMemInMegaBytes = 0 ;
}
void LLViewerTextureList::init()
{
mUpdateStats = TRUE;
// Update how much texture RAM we're allowed to use.

1
indra/newview/llviewertexturelist.h
View File

@ -78,6 +78,7 @@ public:
LLViewerTextureList();
~LLViewerTextureList();
void start();
void init();
void shutdown();
void dump();