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

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

Browse Source 
Conflicts:
	indra/llrender/llrendertarget.cpp
	indra/newview/lloverlaybar.cpp
This commit is contained in:
Siana Gearz
2012-08-09 02:11:14 +02:00
parent de74443d76 d2b13f515d
commit c84e145557
82 changed files with 2314 additions and 1580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llviewerwindow.cpp
View File

@@ -1566,6 +1566,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())
@@ -1590,7 +1591,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();
@@ -3102,7 +3102,7 @@ void LLViewerWindow::updateUI()
}
// snap floaters to top of chat bar/button strip
LLView* chatbar_and_buttons = gOverlayBar->getChild<LLView>("chatbar_and_buttons", TRUE);
LLView* chatbar_and_buttons = gOverlayBar->getChatbarAndButtons();
// find top of chatbar and state buttons, if either are visible
if (chatbar_and_buttons && chatbar_and_buttons->getLocalBoundingRect().notEmpty())
{
@@ -4850,7 +4850,7 @@ void LLViewerWindow::stopGL(BOOL save_state)
if(LLPostProcess::instanceExists())
{
LLPostProcess::getInstance()->invalidate();
LLPostProcess::getInstance()->destroyGL();
}
gTextureList.destroyGL(save_state);