diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-09-04 23:09:56 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-09-04 23:25:54 +0800 |
| commit | 7f8684301a716d23343cd6e85a4759f3a11546d4 (patch) | |
| tree | 989df6258c0399431aba03da5805d93542db5317 /indra/newview/llappviewer.cpp | |
| parent | 0400b6693648c58f901c2b492a78e332815bcaa2 (diff) | |
| parent | a4aa5233cad1fb66555e7768750af1b57bc1da7c (diff) | |
Merge tag 'Second_Life_Release#a4aa523-26.4' into 26.4
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 39a89a9373..8b99657618 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3195,7 +3195,9 @@ bool LLAppViewer::initConfiguration() // This happens AFTER LLSplashScreen::show(). That may or may not be // important. // - if (mSecondInstance && !gSavedSettings.getBOOL("AllowMultipleViewers")) + if (mSecondInstance + && !gGPUBenchmarkMode + && !gSavedSettings.getBOOL("AllowMultipleViewers")) { OSMessageBox( LLTrans::getString("MBAlreadyRunning"), |