diff options
| author | simon <none@none> | 2014-02-18 16:41:21 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-02-18 16:41:21 -0800 |
| commit | 52ce788d0cf77361dc337edaf136f401acd0d4a9 (patch) | |
| tree | 10b483a50bb1f3d897ece66d118036201bd74af7 /indra/newview/llappviewer.cpp | |
| parent | 54ab932884c386950f4f31b9ee63446053c03d59 (diff) | |
| parent | a347267cf1c55a3bd57d30117b8aa834623e1d61 (diff) | |
Pull in viewer-lion to lock down next release
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index e3c89f1a5f..b7a8194b4d 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3190,6 +3190,13 @@ bool LLAppViewer::initWindow() LLNotificationsUI::LLNotificationManager::getInstance(); + +#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); +#endif + if (gSavedSettings.getBOOL("WindowMaximized")) { gViewerWindow->getWindow()->maximize(); |