summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-09-02 21:41:04 +0800
committerErik Kundiman <erik@megapahit.org>2024-09-02 21:41:04 +0800
commitbebe23576988e1cb67fac519452e619152615ebc (patch)
tree8d4e17cd010de451405d92245ca89bac840a8463 /indra/newview
parent95582654e49422d51b55665c3f2821c848ad1cb8 (diff)
parent7c9c142a55f46351e9bc3dace9c2753fee6ed3c9 (diff)
Merge remote-tracking branch 'secondlife/release/2024.08-DeltaFPS' into 2024.08-DeltaFPS
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llappviewer.cpp21
1 files changed, 15 insertions, 6 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index de7c33a151..b851f631e3 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -763,7 +763,9 @@ bool LLAppViewer::init()
// inits from settings.xml and from strings.xml
if (!initConfiguration())
{
- LL_ERRS("InitInfo") << "initConfiguration() failed." << LL_ENDL;
+ LL_WARNS("InitInfo") << "initConfiguration() failed." << LL_ENDL;
+ // quit immediately
+ return false;
}
LL_INFOS("InitInfo") << "Configuration initialized." << LL_ENDL ;
@@ -930,7 +932,9 @@ bool LLAppViewer::init()
if (!initHardwareTest())
{
// Early out from user choice.
- LL_ERRS("InitInfo") << "initHardwareTest() failed." << LL_ENDL;
+ LL_WARNS("InitInfo") << "initHardwareTest() failed." << LL_ENDL;
+ // quit immediately
+ return false;
}
LL_INFOS("InitInfo") << "Hardware test initialization done." << LL_ENDL ;
@@ -946,7 +950,9 @@ bool LLAppViewer::init()
{
std::string msg = LLTrans::getString("MBUnableToAccessFile");
OSMessageBox(msg.c_str(), LLStringUtil::null, OSMB_OK);
- LL_ERRS("InitInfo") << "Failed to init cache" << LL_ENDL;
+ LL_WARNS("InitInfo") << "Failed to init cache" << LL_ENDL;
+ // quit immediately
+ return false;
}
LL_INFOS("InitInfo") << "Cache initialization is done." << LL_ENDL ;
@@ -979,7 +985,9 @@ bool LLAppViewer::init()
if (!gGLManager.mHasRequirements)
{
// Already handled with a MBVideoDrvErr
- LL_ERRS("InitInfo") << "gGLManager.mHasRequirements is false." << LL_ENDL;
+ LL_WARNS("InitInfo") << "gGLManager.mHasRequirements is false." << LL_ENDL;
+ // quit immediately
+ return false;
}
#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
@@ -990,7 +998,9 @@ bool LLAppViewer::init()
// all hell breaks lose.
std::string msg = LLNotifications::instance().getGlobalString("UnsupportedCPUSSE2");
OSMessageBox(msg.c_str(), LLStringUtil::null, OSMB_OK);
- LL_ERRS("InitInfo") << "SSE2 is not supported" << LL_ENDL;
+ LL_WARNS("InitInfo") << "SSE2 is not supported" << LL_ENDL;
+ // quit immediately
+ return false;
}
#endif
@@ -4021,7 +4031,6 @@ void LLAppViewer::forceQuit()
LLApp::setQuitting();
}
-//TODO: remove
void LLAppViewer::fastQuit(S32 error_code)
{
// finish pending transfers