summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2017-12-12 16:54:59 +0200
committerandreykproductengine <andreykproductengine@lindenlab.com>2017-12-12 16:54:59 +0200
commit27a3961168b958ce612bb12f0e56891a60144864 (patch)
treeb5855db0c15b0863f8bfa71c76f2bdbd2644a48f
parent4133caebe36b3433036c6b7a4301288f0f695de9 (diff)
MAINT-8071 Handle initialization crash better
-rw-r--r--indra/newview/llviewerwindow.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index df0921954c..e9ecd1fca6 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1957,7 +1957,11 @@ void LLViewerWindow::initBase()
// (But wait to add it as a child of the root view so that it will be in front of the
// other views.)
MainPanel* main_view = new MainPanel();
- main_view->buildFromFile("main_view.xml");
+ if (!main_view->buildFromFile("main_view.xml"))
+ {
+ LL_ERRS() << "Failed to initialize viewer: Viewer couldn't process file main_view.xml, "
+ << "if this problem happens again, please validate your installation." << LL_ENDL;
+ }
main_view->setShape(full_window);
getRootView()->addChild(main_view);