summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-12-02 12:33:51 -0800
committerLeslie Linden <leslie@lindenlab.com>2011-12-02 12:33:51 -0800
commitef0552a090123974682790afdafec68218578113 (patch)
treea67ef723145d4d646289354918dd008412ab6eb3 /indra/newview/llviewerwindow.cpp
parent4d14bb02b908c37f73e915af811027c1d193b667 (diff)
EXP-1642 FIX -- Viewer crash on startup on Mac
Minimum window size setting no longer forces propagation to the OS before root view is initialized.
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r--indra/newview/llviewerwindow.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index c38eda5d30..eb72a8657f 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1597,7 +1597,8 @@ LLViewerWindow::LLViewerWindow(const Params& p)
LL_WARNS("Window") << " Someone took over my signal/exception handler (post createWindow)!" << LL_ENDL;
}
- mWindow->setMinSize(p.min_width, p.min_height);
+ const bool do_not_enforce = false;
+ mWindow->setMinSize(p.min_width, p.min_height, do_not_enforce); // root view not set
LLCoordScreen scr;
mWindow->getSize(&scr);