diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-11-06 13:28:06 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-11-06 13:28:06 +0800 |
| commit | ce43d94c9de73eda527f2f4bd50fe3e144beaee2 (patch) | |
| tree | 713f14053910e0f6e8c87c9342094f25516b8171 /indra/newview | |
| parent | 5394ee7b457ea85145309f0f17695b1a7a74ca69 (diff) | |
| parent | e503826134284d5d64f60ed5028794e6a90aa6b1 (diff) | |
Merge branch 'main' into DRTVWR-559
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_login_first.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index d9f6333818..772c95a85b 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -971,6 +971,7 @@ bool LLAppViewer::init() return 0; } +#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__) // Without SSE2 support we will crash almost immediately, warn here. if (!gSysCPU.hasSSE2()) { @@ -982,6 +983,7 @@ bool LLAppViewer::init() OSMB_OK); return 0; } +#endif // alert the user if they are using unsupported hardware if(!gSavedSettings.getBOOL("AlertedUnsupportedHardware")) diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml index e3b16952ad..45dc5ce145 100644 --- a/indra/newview/skins/default/xui/en/panel_login_first.xml +++ b/indra/newview/skins/default/xui/en/panel_login_first.xml @@ -5,7 +5,7 @@ name="panel_login" focus_root="true" background_visible="true" - bg_opaque_color="0.16 0.16 0.16 1" + bg_opaque_color="0.0 0.0 0.0 1" background_opaque="true" width="1024"> <panel.string |