diff options
| author | Graham Linden <none@none> | 2014-07-31 08:40:57 -0700 |
|---|---|---|
| committer | Graham Linden <none@none> | 2014-07-31 08:40:57 -0700 |
| commit | db43a0560c259623a1a8022668f8482d82cae9c8 (patch) | |
| tree | 31e532720212ed1697897d6c2694fe991cb8f812 /indra/newview/llappviewer.cpp | |
| parent | 76e7f978c157f9921593ea0e43f642cb9de4703d (diff) | |
| parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) | |
Merge viewer-release
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index b69cd81078..24150daea4 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -100,6 +100,7 @@ #include "llspellcheck.h" #include "llscenemonitor.h" #include "llavatarrenderinfoaccountant.h" +#include "lllocalbitmaps.h" // Linden library includes #include "llavatarnamecache.h" @@ -1758,7 +1759,9 @@ bool LLAppViewer::cleanup() #if 0 // this seems to get us stuck in an infinite loop... gTransferManager.cleanup(); #endif - + + LLLocalBitmapMgr::cleanupClass(); + // Note: this is where gWorldMap used to be deleted. // Note: this is where gHUDManager used to be deleted. @@ -3190,7 +3193,8 @@ bool LLAppViewer::initWindow() #ifdef LL_DARWIN //Satisfy both MAINT-3135 (OSX 10.6 and earlier) MAINT-3288 (OSX 10.7 and later) if (getOSInfo().mMajorVer == 10 && getOSInfo().mMinorVer < 7) - gViewerWindow->getWindow()->setOldResize(true); + if ( getOSInfo().mMinorVer == 6 && getOSInfo().mBuild < 8 ) + gViewerWindow->getWindow()->setOldResize(true); #endif if (gSavedSettings.getBOOL("WindowMaximized")) |