summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2013-12-17 00:12:26 -0800
committerAura Linden <aura@lindenlab.com>2013-12-17 00:12:26 -0800
commitddd6b8f91baa4ce408682925e12c4a58b8139b78 (patch)
tree6f98aa26d60bc50d52de1e75376c58541235ad35 /indra/newview
parent1a456c2e41905e93e393dc2dda0d143ee7611275 (diff)
Mac Fullscreen fix for MAINT-3288 and MAINT-3135
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llappviewer.cpp7
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();