Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'future' of git://github.com/Shyotl/SingularityViewer

Browse Source 
Conflicts:
	indra/newview/llvovolume.cpp
This commit is contained in:
Lirusaito
2012-08-01 06:48:42 -04:00
parent 1c9f996248 1d1947c51a
commit e03de192c8
62 changed files with 2031 additions and 1417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewerwindow.cpp
View File

@@ -1565,6 +1565,7 @@ LLViewerWindow::LLViewerWindow(
LLVertexBuffer::initClass(gSavedSettings.getBOOL("RenderVBOEnable"), gSavedSettings.getBOOL("RenderVBOMappingDisable"));
LL_INFOS("RenderInit") << "LLVertexBuffer initialization done." << LL_ENDL ;
gGL.init() ;
LLImageGL::initClass(LLViewerTexture::MAX_GL_IMAGE_CATEGORY) ;
if (LLFeatureManager::getInstance()->isSafe()
|| (gSavedSettings.getS32("LastFeatureVersion") != LLFeatureManager::getInstance()->getVersion())
@@ -1589,7 +1590,6 @@ LLViewerWindow::LLViewerWindow(
// Init the image list. Must happen after GL is initialized and before the images that
// LLViewerWindow needs are requested.
LLImageGL::initClass(LLViewerTexture::MAX_GL_IMAGE_CATEGORY) ;
gTextureList.init();
LLViewerTextureManager::init() ;
gBumpImageList.init();
@@ -4842,7 +4842,7 @@ void LLViewerWindow::stopGL(BOOL save_state)
if(LLPostProcess::instanceExists())
{
LLPostProcess::getInstance()->invalidate();
LLPostProcess::getInstance()->destroyGL();
}
gTextureList.destroyGL(save_state);