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 | |
| parent | 0400b6693648c58f901c2b492a78e332815bcaa2 (diff) | |
| parent | a4aa5233cad1fb66555e7768750af1b57bc1da7c (diff) | |
Merge tag 'Second_Life_Release#a4aa523-26.4' into 26.4
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llfloateraddpaymentmethod.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_add_payment_method.xml | 4 |
3 files changed, 11 insertions, 2 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"), diff --git a/indra/newview/llfloateraddpaymentmethod.cpp b/indra/newview/llfloateraddpaymentmethod.cpp index fc962ce89f..64bd7b6aa1 100644 --- a/indra/newview/llfloateraddpaymentmethod.cpp +++ b/indra/newview/llfloateraddpaymentmethod.cpp @@ -29,6 +29,7 @@ #include "llfloateraddpaymentmethod.h" #include "llnotificationsutil.h" #include "lluictrlfactory.h" +#include "llviewernetwork.h" #include "llweb.h" @@ -63,7 +64,9 @@ void LLFloaterAddPaymentMethod::onContinueBtn() S32 opt = LLNotificationsUtil::getSelectedOption(notif, resp); if (opt == 0) { - LLWeb::loadURL(this->getString("continue_url")); + const std::string& grid_id = LLGridManager::getInstance()->getGridId(); + const std::string& grid_id_lower = utf8str_tolower(grid_id); + LLWeb::loadURL(getString(grid_id_lower == "damballah" ? "continue_staging_url" : "continue_url")); } }); } diff --git a/indra/newview/skins/default/xui/en/floater_add_payment_method.xml b/indra/newview/skins/default/xui/en/floater_add_payment_method.xml index 308f4feb5a..18f5f2af32 100644 --- a/indra/newview/skins/default/xui/en/floater_add_payment_method.xml +++ b/indra/newview/skins/default/xui/en/floater_add_payment_method.xml @@ -17,6 +17,10 @@ name="continue_url"> https://secondlife.com/my/lindex/buy.php?associate_for_viewer=1 </floater.string> + <floater.string + name="continue_staging_url"> + https://secondlife-staging.com/my/lindex/buy.php?associate_for_viewer=1 + </floater.string> <panel background_opaque="false" bg_alpha_color="PanelGray" |