summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-02-18 14:11:17 -0800
committerAura Linden <aura@lindenlab.com>2014-02-18 14:11:17 -0800
commit800409bdfc0d9e14b3ae36526d505021fc50b32e (patch)
treee15b79f7b083a3173fafc0899faad293e2380c4f /indra
parentd1afaf594d6de0954ba9456bd8391c22d008a506 (diff)
Maint-3135 Discovered apple made this change in 10.6.8 not 10.7.0
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llappviewer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index b7a8194b4d..d4fdf8fd49 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3194,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"))