diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-08-06 09:22:43 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-08-06 09:22:43 -0700 |
| commit | 81c342dfa9ac04378e22c76f119408e6e00c0f13 (patch) | |
| tree | 728de42a95d436d7a753bf3884d683d4201b5ad0 /indra/newview/llappviewer.cpp | |
| parent | 3b2f456416d29534cb41fc9d4ad3bf195dcfc847 (diff) | |
| parent | 1346949e4d601e8c945fa30593ba1d405e9ed80d (diff) | |
Merge with 3.7.13-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 c65bddc58b..cd9e5da7a7 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" @@ -1759,7 +1760,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. @@ -3191,7 +3194,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")) |