From b268c8236a634fd7171651334cdb9d6239fe89a8 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Mon, 7 Oct 2024 17:24:47 +0100
Subject: [PATCH 01/21] FIRE-34564 - bugsplat assertion mismatched locks in
 snapshot

relax the lock on the filter.
---
 indra/llimage/llimagefilter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llimage/llimagefilter.cpp b/indra/llimage/llimagefilter.cpp
index 1703e30dbe..da3519e3ab 100644
--- a/indra/llimage/llimagefilter.cpp
+++ b/indra/llimage/llimagefilter.cpp
@@ -88,7 +88,7 @@ void LLImageFilter::executeFilter(LLPointer<LLImageRaw> raw_image)
 {
     mImage = raw_image;
 
-    LLImageDataLock lock(mImage);
+    LLImageDataSharedLock lock(mImage); // <FS:Beq> FIRE-34564 Bugsplat SHARED vs EXCLUSIVE lock conflict
 
     //std::cout << "Filter : size = " << mFilterData.size() << std::endl;
     for (S32 i = 0; i < mFilterData.size(); ++i)

From bb04827291f67505a576572ab3d249b302526c3a Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Mon, 7 Oct 2024 17:28:03 +0100
Subject: [PATCH 02/21] Attempt to identify AVX2 (in)capable CPUs and divert to
 other build

Includes initial AI translations for all supported languages, these may need revising
---
 indra/newview/CMakeLists.txt                  |   6 +++
 indra/newview/fs_viewer_manifest.py           |   9 +++-
 .../installers/windows/installer_template.nsi |  44 +++++++++++++++++-
 indra/newview/installers/windows/lang_de.nsi  |   2 +
 .../newview/installers/windows/lang_en-us.nsi | Bin 15250 -> 16212 bytes
 indra/newview/installers/windows/lang_es.nsi  | Bin 15460 -> 16412 bytes
 indra/newview/installers/windows/lang_fr.nsi  | Bin 16204 -> 17256 bytes
 indra/newview/installers/windows/lang_it.nsi  | Bin 15188 -> 16050 bytes
 indra/newview/installers/windows/lang_ja.nsi  | Bin 13336 -> 14044 bytes
 indra/newview/installers/windows/lang_pl.nsi  | Bin 15552 -> 16436 bytes
 indra/newview/installers/windows/lang_ru.nsi  | Bin 15392 -> 16364 bytes
 indra/newview/viewer_manifest.py              |   3 ++
 12 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index f8300069ac..ef11a84b67 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2252,6 +2252,7 @@ if (WINDOWS)
         "--fmodstudio=${USE_FMODSTUDIO}"
         "--openal=${USE_OPENAL}"
         "--tracy=${USE_TRACY}"
+        "--avx2=${USE_AVX2_OPTIMIZATION}"
         --build=${CMAKE_CURRENT_BINARY_DIR}
         --buildtype=$<CONFIG>
         "--channel=${VIEWER_CHANNEL}"
@@ -2315,6 +2316,7 @@ if (WINDOWS)
               "--fmodstudio=${USE_FMODSTUDIO}"
               "--openal=${USE_OPENAL}"
               "--tracy=${USE_TRACY}"
+              "--avx2=${USE_AVX2_OPTIMIZATION}"
               --build=${CMAKE_CURRENT_BINARY_DIR}
               --buildtype=$<CONFIG>
               "--channel=${VIEWER_CHANNEL}"
@@ -2500,6 +2502,7 @@ if (LINUX)
         "--fmodstudio=${USE_FMODSTUDIO}"
         "--openal=${USE_OPENAL}"
         "--tracy=${USE_TRACY}"
+        "--avx2=${USE_AVX2_OPTIMIZATION}"        
         --build=${CMAKE_CURRENT_BINARY_DIR}
         --buildtype=${CMAKE_BUILD_TYPE}
         "--channel=${VIEWER_CHANNEL}"
@@ -2527,6 +2530,7 @@ if (LINUX)
       "--fmodstudio=${USE_FMODSTUDIO}"
       "--openal=${USE_OPENAL}"
       "--tracy=${USE_TRACY}"
+      "--avx2=${USE_AVX2_OPTIMIZATION}"      
       --build=${CMAKE_CURRENT_BINARY_DIR}
       --buildtype=${CMAKE_BUILD_TYPE}
       "--channel=${VIEWER_CHANNEL}"
@@ -2622,6 +2626,7 @@ if (DARWIN)
       "--fmodstudio=${USE_FMODSTUDIO}"
       "--openal=${USE_OPENAL}"
       "--tracy=${USE_TRACY}"
+      "--avx2=${USE_AVX2_OPTIMIZATION}"      
       --build=${CMAKE_CURRENT_BINARY_DIR}
       --buildtype=$<CONFIG>
       --bundleid=${MACOSX_BUNDLE_GUI_IDENTIFIER}
@@ -2659,6 +2664,7 @@ if (DARWIN)
           "--fmodstudio=${USE_FMODSTUDIO}"
           "--openal=${USE_OPENAL}"
           "--tracy=${USE_TRACY}"
+          "--avx2=${USE_AVX2_OPTIMIZATION}"          
           --build=${CMAKE_CURRENT_BINARY_DIR}
           --buildtype=${CMAKE_BUILD_TYPE}
           "--channel=${VIEWER_CHANNEL}"
diff --git a/indra/newview/fs_viewer_manifest.py b/indra/newview/fs_viewer_manifest.py
index d6666d0fef..8093f9d3f6 100644
--- a/indra/newview/fs_viewer_manifest.py
+++ b/indra/newview/fs_viewer_manifest.py
@@ -4,18 +4,25 @@ import tarfile
 
 class FSViewerManifest:
     def fs_installer_basename(self):
+        if self.fs_is_avx2():
+            opt_string = "AVX2"
+        else:
+            opt_string = "LEGACY"
         substitution_strings = {
             'version' : '.'.join(self.args['version']),
             'version_short' : '.'.join(self.args['version'][:-1]),
             'version_dashes' : '-'.join(self.args['version']),
             'app_name':self.app_name(),
+            'optimized': opt_string,
             'app_name_oneword':self.app_name_oneword()
             }
 
-        return "Phoenix-%(app_name)s-%(version_dashes)s" % substitution_strings
+        return "Phoenix-%(app_name)s_%(optimized)s-%(version_dashes)s" % substitution_strings
 
     def fs_is_opensim(self):
         return self.args['viewer_flavor'] == 'oss' #Havok would be hvk
+    def fs_is_avx2(self):
+        return self.args['avx2'] == 'ON' 
 
     def fs_splice_grid_substitution_strings( self, subst_strings ):
         ret = subst_strings
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index bb62d35b1d..e0c515917b 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -32,7 +32,7 @@ SetCompressor /solid lzma	# Compress whole installer as one block
 SetDatablockOptimize off	# Only saves us 0.1%, not worth it
 XPStyle on                  # Add an XP manifest to the installer
 RequestExecutionLevel admin	# For when we write to Program Files
-Unicode true                # Enable unicode support
+Unicode true                # Enable unicode support
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Project flags
@@ -181,6 +181,42 @@ Function dirPre
 
 FunctionEnd    
 
+; Add the AVX2 check functions
+Function CheckCPUFlagsAVX2
+    Push $1
+    System::Call 'kernel32::IsProcessorFeaturePresent(i 40) i .r1'  ; 40 is PF_AVX2_INSTRUCTIONS_AVAILABLE
+    IntCmp $1 1 OK_AVX2
+    ; AVX2 not supported
+    MessageBox MB_OK $(MissingAVX2)
+    Quit
+
+  OK_AVX2:
+    Pop $1
+    Return
+FunctionEnd
+
+Function CheckCPUFlagsAVX2_Prompt
+    Push $1
+    System::Call 'kernel32::IsProcessorFeaturePresent(i 40) i .r1'  ; 40 is PF_AVX2_INSTRUCTIONS_AVAILABLE
+    IntCmp $1 1 OK_AVX2 Not_AVX2
+
+  OK_AVX2:
+    MessageBox MB_YESNO $(AVX2Available) IDYES DownloadAVX2 IDNO ContinueInstall
+    DownloadAVX2:
+      ExecShell open 'https://www.firestormviewer.org/early-access-beta-downloads/'
+      Quit
+    ContinueInstall:
+      Goto End
+
+  Not_AVX2:
+    ; CPU does not support AVX2, continue installation
+    Goto End
+
+  End:
+    Pop $1
+    Return
+FunctionEnd
+
 # <FS:Ansariel> Optional start menu entry
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Post-directory page callback
@@ -224,6 +260,12 @@ ${If} $0 != ""
 ${EndIf}
 
 Call CheckCPUFlags							# Make sure we have SSE2 support
+${If} ${ISAVX2} == 1
+  Call CheckCPUFlagsAVX2
+${Else}
+  Call CheckCPUFlagsAVX2_Prompt
+${EndIf}
+
 Call CheckWindowsVersion					# Don't install On unsupported systems
     Push $0
     ${GetParameters} $COMMANDLINE			# Get our command line
diff --git a/indra/newview/installers/windows/lang_de.nsi b/indra/newview/installers/windows/lang_de.nsi
index 164f165f50..a11e4d505a 100755
--- a/indra/newview/installers/windows/lang_de.nsi
+++ b/indra/newview/installers/windows/lang_de.nsi
@@ -57,6 +57,8 @@ LangString CheckAdministratorUnInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende
 
 ; checkcpuflags
 LangString MissingSSE2 ${LANG_GERMAN} "Dieser PC besitzt möglicherweise keinen Prozessor mit SSE2-Unterstützung, die für die Ausführung von Firestorm ${VERSION_LONG} benötigt wird. Trotzdem installieren?"
+LangString MissingAVX2 ${LANG_GERMAN} "Ihre CPU unterstützt keine AVX2-Anweisungen. Bitte laden Sie die Version für ältere CPUs von https://www.firestormviewer.org/early-access-beta-downloads-legacy-cpus/ herunter."
+LangString AVX2Available ${LANG_GERMAN} "Ihre CPU unterstützt AVX2-Anweisungen. Sie können die für AVX2 optimierte Version für eine bessere Leistung unter https://www.firestormviewer.org/early-access-beta-downloads/ herunterladen. Möchten Sie sie jetzt herunterladen?"
 
 ; closesecondlife function (install)
 LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Firestorm ..."
diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi
index c301aa0e4effca0443b3b3ef49d0096f99caa2a3..69cde24d32108fdb6e87e096a9bc92af7e9e6aba 100644
GIT binary patch
delta 646
zcmbVK!AiqG6ddtTe?UA)!UoZrLo9f(2M<!jiy+p6qQ`U-HCUUP#Mbtp|KR?J;IH^2
zo&|B<Hh~1hgDlDJn>X+6?CicyKc3&_Zg(FFM|eVk7$ZddM?^Hnc(n5^5sf?KjJDCk
z1un4*-*}GSDkF2&+I+b}%8HDvL-cXZIU*9<x)E0ek(`V%M@pW=RX2r%d*{S5GBoFe
z96@%->SM@0A)~nLI%RH1MrgGbpvEnxgmyzvW5%eGF(I0<*tRrZ?UPe!mXSR}VA-0C
zoFl-1tAbcy#n-oyY`uR_T9l(>mX@8>>L@)-Sf7v^VqiX3{9lY|+91YO)qfkYuvji9
zqyY<q>lzic%XQWJrF-;S{JiHkXHssrVF}}Fdn2kmzPyCYcx&tCyM5gKpIIGq;BGkb
R0-6F7YEcwV{Qbf8oF6jTe!c(z

delta 16
YcmcaoH>rF>mE7casy3S|l<vp?07wD{%K!iX

diff --git a/indra/newview/installers/windows/lang_es.nsi b/indra/newview/installers/windows/lang_es.nsi
index 37897d5981b70b5e97c5e0bb7708b68a558532d5..cf36e452856ca2e57ceac97400e86c21994edfb7 100755
GIT binary patch
delta 786
zcmcIiJxjw-6um74KL(*<rCOzFjoONB!BJ5ubrh_i#la;_OB+c)NE1JY`XAonAdVeH
z$gbc&aB=S7=;A-{+?P~~I0+Ko*LnAzd+y15JHNdSJWR&Lk~%G3=O;$;RH7qV6EDHV
z?g2TZP=Shch_y*A%vI`O*0FC;n>4b?pfZ`jJ+z6{1kO<gayp2xz@y_ckk#}V{5q6H
z+>XR_WLZ?h>@g@J9SP^Sh9$9q4h<Y!wFXwNPDSSPye^z{VXrE4OuC>9c3hcNcW^3W
zX9LSn1zOI)WMb8D;#=;5>+3R8M}H3RoJgp#$UtwNP7z_q9?K#>mj2<=fA~{`jw&>I
z+}`@-R*)=_h|F|bkju6-FfL_FY~;6ng9e7N77VdL%Rj|Jw1b@jhAN%F7Dg<2Tk&~0
z(#DPAi;<S&R3}?pr8m2OGd?FD!4vJHz9E(T+9<T}!%{HnQk_QIl%#Qd8$fk3MJ)ay
yN|9NyrOt_Va@5^b-UCCxy{jx7heU5GD*CBa_jx(Qw^6sBx(kS#tm^hw9>bsA$f1k?

delta 75
zcmbQ!!1$zMgOL2>8%n<zc{g8F)@EYlovf&AKiNuc8BpN9S}Y4A@5G0aljrE@Y;MqI
cVFdFw&(WF3$jZyW#lSl`&`5c6oZdb`0OBPWP5=M^

diff --git a/indra/newview/installers/windows/lang_fr.nsi b/indra/newview/installers/windows/lang_fr.nsi
index fc263d1eab7734006628d93f99d1bf9b4ad3d6c8..5312e31426c8fc2ac0e137342f22ac4e3d907e65 100755
GIT binary patch
delta 772
zcmbVJyGjF55S>-QS3nS=@r5^%C~6YLKmwwL*rl;D2DMq^qJij!>?WdxWqO%X3kxe7
zg>9^SG&WkOrC(rvAcd7@uCKxeD7UzC&pmTy=FIKxQ^h!aP<-tR@N&PeafZ^Ap$Xpe
zhm$tBR3wWO6>!^>MeN{MRKi=)=Et9fcvbUEa`>d9b3U)RigNgIv`z{6F5b3A6uniV
z81m9uGe>zGi*|sxR7G4x&N`W>wg$Y&_x>(k>}yGy(8xkd>N>ja*Zu@w1*3p&bDA~D
z;nCSSOY7xno1%!aIImMhX$6rBEQ&mvwxFHIZQ|tslg`$3hGb^7u0vyd<?Hdk&oV=0
zFk}vsR`{ZMh%e&}L%+Ky-fI8Ex23=OW@EZn2P7&(=~wrrZS*Z$*wCI-!T;QZ>{(P~
zx8j@v%hJ<GSHO885N!L#)8zj=9pin~7Z<O7*thOL{M<y(;*sp#r9<yVwHo{wPVnhS
z6HoRGdQ$_(2G_c~IS~x;VCabN)D$1|#=J!Mxt`DJ0$yr3W^ko3z^UPgcRo@uI5Qsd
I(ve#G3$Zn@_W%F@

delta 93
zcmaFS#(1V~!zG2upERr{zme3MoS?dZk#};TxipZave{1U0waPu*+*juBk$(-8mTNm
kK}UJX%{jVyAbB8ja*nRf=6iYtjI6v2TnxOM{S73A0YLN}j{pDw

diff --git a/indra/newview/installers/windows/lang_it.nsi b/indra/newview/installers/windows/lang_it.nsi
index 34e3bdcebda87085d5dcb62da223fb5c688a8521..d7447ed46b5c8882bada018b85968a872a7141f0 100755
GIT binary patch
delta 696
zcmbV~&r1S96vv+xn$p1n!PIPx(u7u{a~JViBt+6F8Gj(c*6OYrNzoti?sf^!(*6hC
z6NC<3qv+hNYu}j^6Y3(v?3?%IGxOg2&OWyvZu-3_fB1uJtSxyml&4eL<Dqw}dO(6S
zYEnztEam6~{sozs8rg`~F-)?+NYbDRzBTML5o=KgYsuCS9o<VQtdFS#-a=ejjSmB>
zF?qHMuS8cM>hLVsan3Rc9&TrkD(aj8MptYJoQ<JV5i41RPG#i0L{<Y<z>~YbZ`YBd
zj_Pbm^Q%7`7+02|HuxG?K}CM@CU5`lfA+p}$Z9Gz>?s8-)GpPN8n#vEHYk$|0Z+k1
zS50{5m>mqEx|}F9u6`1cWEHnb?WM+YM`n<(BBtJCq^g)r)wFuc{J%Z@^doB!d>8#<
zcO=B!*d{NA;(WH^bKKgsi{J6v_1EM480+zUbf0&_DL@hDbE7lQFLOa2BzByBd_j@U
OAklTXd`=_zw)_oE!<euD

delta 70
zcmdl~d!=l{GP%h@N*@?`H!~`~W@O}@%&2TXSxa>pP~f~OBMT$%#D|iT4YYMOi)gU`
XrGdQ72HNu&S$P?_7=TK29t#2hJhByb

diff --git a/indra/newview/installers/windows/lang_ja.nsi b/indra/newview/installers/windows/lang_ja.nsi
index 8322d86f8125060c471638192a90f661607091ae..b0d8958984fd211507faff46775c9e5b02a8fc64 100755
GIT binary patch
delta 576
zcmbVIO(=r_7=AY<NpkS>Ws_~RBJ({t?66W~2a!$wmxJFKnQz+s<iNPd-$C93IXQ_F
zwG=l;oH!_lk)&420Y{2=D-Ozm-plj8&-1+XJexzY(F0QfFQ|EZt7I8!sGU0bSt*Uw
zBjRyELoGE?8wHVMsFG${AKdFW#0}nYiVh6Ig;{igp-0?zA=e|s@rrd=Ml?JM+D8MH
zaDpAdPr{!iT^{tHO}tJr(-4izj8T}Jq{>Xu6dSE}kB@pOL;;#6yP$p<pJ>9e^$8l6
zo1F$ID0)p)LD>hAY(Q9l(vfiX%jXHXt30n7^S^S`(4;7a#n&s}0vyr*HM3U|FJc+j
zTP|GU3VV|6Rx%z-_KofpbYmVP(0w;Y{^7N}mb%cd&16b7el$v*UO3rct@Zw|0F^4F
z)N{8NO+RW+d~QI|hn3$<RlJ&8#&ZRed{^k;YI8a}j4@8lP&nIY<7U%t^xc%1!Y>Ae
bHA{KaZBEniV2%>iEZaJE*h->~;`{7REI_Pa

delta 87
zcmcbUJ0oL*jMU_JGPf9cCqI<4pUftA2h4g7Bwx$ePBswNoBT&kX0x9{8xv6IBdg@*
jH%dl~5a#4JN;;d9R7x0Gc^SAEcqjkXP~QAY^^pJoya6AS

diff --git a/indra/newview/installers/windows/lang_pl.nsi b/indra/newview/installers/windows/lang_pl.nsi
index 2a8ea7ef1da7d929506a4c4770e02d1ba23342ad..3356eed567c5c3a51dcf196642255339fcc7925c 100644
GIT binary patch
delta 785
zcmbVKJxjw-6um)I5G<lgs$ib2AF=cU9II5cOA$l|k%CkDflXVJ(lmyYLj4WC#Z@Ss
zg*bHd-w3WnXU}_02X#>74Y~K`oOACz@4fiXcgoYM#)lDg#UuyEB#W-;h%Tu}dwgRi
z-oGG^##ARpEozfZWvT*aBWA#w$QZH`YR8HTt_!TF2_=U*z`4`_tBwkrDpMNqx#S6j
zHg%DEGID^7DvT=BB!gI5iWq=60QnHA0s4KEF~|)6v;0-hpH)F@gYHubQ8^shK~_SG
z4r(dL+u&G0*~lwUPa&>i0l^T=GP<~^XZT}eEgD*a1#W>b<!~jz_|>GpnIkNl_7LWr
zVy>PdtQOX^q*ZNno`*GEWG(FB(+w(3GW)XRA+cx{fUizYWs?vxV1bXX3x*HzMkpy(
zZ^>p8z7I<b+=PWzSIVSm7Q7nTb|f-O85~cZ``twUf2L>TOUTP<7%Z=am-Tb$y4<WI
z--rSHA;o9`XCG6QsmbHoJI^huyr*pkMK)CUAR-f<iw(G{9Rw^sn&EF-Dlh2CV0~vv
U;U9BqP|!yTKS^%}dg5XE6Q`u05dZ)H

delta 98
zcmdnez<8i?gOvQ_BsHtaQj%JelxH#WPJSpUJxN(*@+$SH%|<Fdj0llEs!JGoH^-}e
rWd?~cNlreXt+RQCmH=1@ljP<D+B+Coc^SAEcqi{SRNg#CcZLuEX>A}X

diff --git a/indra/newview/installers/windows/lang_ru.nsi b/indra/newview/installers/windows/lang_ru.nsi
index 3f75a5b5806f0ccdbece65b11e7c38c1115de3ac..c7bb70ad02e5106f57ee501d6baaae72cd2bf90a 100755
GIT binary patch
delta 728
zcmbVKOD_Xa6h6bT!A6NrwP~ggX^GNI45Rv*HXaGl*odW~kw$}f+qAK_k+T)yACUPQ
zHWKkG*oZyf3?iZnk(2v6-#Pc3@4NTv_^EO88k9#<?XJ=utV&z7K^861GU;-w#JowK
zWsP#2=PXaN!4@pbd1>nnMKm%wgL46BkyF4;nD&)V!=y<`^;IokNuI%&K&*iX9djO;
zCNJPL%9C8eT6FJ90x?)eU6ZHa{Z$+Fb=RN8?DR8-{1kFhayn2fRj5q6RHGA0V7CUV
zxZD!7irqeZ30kLZIs(@k)-q0e@YR5BxEW678tu>l{3CMT<M)0l0%nJZs3NwE+iG&%
z67zY$tGPxUz5d1@G$IceXp{!8F|hbh=v%V_&jZbJ4v5KVjByO-J#<vgz>2PlKQ;aA
zI6&X>=G>GyG;1Kq<dU3w`@PPCIY<*JH~%N)i1YB&k2{@)o6|9P(XD9UOE@3HvY&&k
zil}{kqJ^V&QhQKjdR&!Y_)cDeX*u%`0|-bw+G*D#7p-FUs8Wv)*()(tWGSH9_4uWt
KwA-P<x2|{AD1Yhz

delta 84
zcmaD;zo25n7rDuY)T}0RC?8_vo%m34vVpSNW)77rjBws$DYa#cyqou{>9at@{B(3S
a8)>sZRBZOsna9Y=%fQ9JyZNo|e?b5qNE{si

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 375fc4d2e2..515cdd75fd 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -951,6 +951,7 @@ class Windows_x86_64_Manifest(ViewerManifest):
         
         substitution_strings['installer_file'] = installer_file
         substitution_strings['is64bit'] = (1 if (self.address_size == 64) else 0)
+        substitution_strings['isavx2'] = (1 if (self.fs_is_avx2) else 0)
         substitution_strings['is_opensim'] = self.fs_is_opensim() # <FS:Ansariel> FIRE-30446: Register hop-protocol for OS version only
         substitution_strings['friendly_app_name'] = self.friendly_app_name() # <FS:Ansariel> FIRE-30446: Set FriendlyAppName for protocol registrations
         substitution_strings['icon_suffix'] = ("_os" if (self.fs_is_opensim()) else "") # <FS:Ansariel> FIRE-24335: Use different icon for OpenSim version
@@ -975,6 +976,7 @@ class Windows_x86_64_Manifest(ViewerManifest):
             !define SHORTCUT   "%(app_name)s"
             !define URLNAME   "secondlife"
             !define IS64BIT   "%(is64bit)d"
+            !define ISAVX2   "%(isavx2)d"
             !define ISOPENSIM   "%(is_opensim)d"
             !define APPNAME   "%(friendly_app_name)s"
             !define ICON_SUFFIX   "%(icon_suffix)s"
@@ -2454,6 +2456,7 @@ if __name__ == "__main__":
         dict(name='fmodstudio', description="""Indication if fmod studio libraries are needed""", default='OFF'),
         dict(name='openal', description="""Indication openal libraries are needed""", default='OFF'),
         dict(name='tracy', description="""Indication tracy profiler is enabled""", default='OFF'),
+        dict(name='avx2', description="""Indication avx2 instruction set is enabled""", default='OFF'),
         ]
     try:
         main(extra=extra_arguments)

From bccf19778c63676fc71fb32c4f153167ace00310 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Mon, 7 Oct 2024 17:29:24 +0100
Subject: [PATCH 03/21] FIRE-34509 - Add camera roll to overlooked cameratools
 floater

Why do we have so many camera tools/phototools, camera floater variants?
---
 .../xui/en/floater_phototools_camera.xml      | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/indra/newview/skins/default/xui/en/floater_phototools_camera.xml b/indra/newview/skins/default/xui/en/floater_phototools_camera.xml
index 43214c138e..b0340a53f6 100644
--- a/indra/newview/skins/default/xui/en/floater_phototools_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_phototools_camera.xml
@@ -238,6 +238,36 @@
 						 tool_tip="Orbit camera around focus"
 						 top="5"
 						 width="100"/>
+					<!-- <FS:Beq> FIRE-34509 Add Camera roll -->
+						<button
+						follows="bottom|left"
+						width="12"
+						height="12"
+						image_selected="VirtualTrackball_Rotate_Left_Active"
+						image_unselected="VirtualTrackball_Rotate_Left"
+						layout="topleft"
+						top_delta="85"
+						left_delta="5"
+						name="roll_left"
+						tool_tip="Roll camera Left">
+						<commit_callback function="Camera.roll_left" />
+						<mouse_held_callback function="Camera.roll_left" />
+					</button>
+					<button
+						follows="bottom|right"
+						width="12"
+						height="12"
+						image_selected="VirtualTrackball_Rotate_Right_Active"
+						image_unselected="VirtualTrackball_Rotate_Right"
+						layout="topleft"
+						top_delta="0"
+						left_delta="78"
+						name="roll_right"
+						tool_tip="Roll camera Right">
+						<commit_callback function="Camera.roll_right" />
+						<mouse_held_callback function="Camera.roll_right" />
+					</button>
+					<!-- </FS:Beq> -->						 
 						<button
 						 follows="top|left"
 						 height="18"

From 73aacfe2e07529cd90e7df12b3d4a8e90bd3dde3 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Mon, 7 Oct 2024 19:54:28 +0200
Subject: [PATCH 04/21] Update German translation

---
 .../newview/skins/default/xui/de/floater_phototools_camera.xml  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/newview/skins/default/xui/de/floater_phototools_camera.xml b/indra/newview/skins/default/xui/de/floater_phototools_camera.xml
index 621fe231f4..25490cfcad 100644
--- a/indra/newview/skins/default/xui/de/floater_phototools_camera.xml
+++ b/indra/newview/skins/default/xui/de/floater_phototools_camera.xml
@@ -56,6 +56,8 @@
 					</panel>
 					<panel name="zoom">
 						<joystick_rotate name="cam_rotate_stick" tool_tip="Kamera um Fokus kreisen"/>
+						<button name="roll_left" tool_tip="Kamera nach links rollen" />
+						<button name="roll_right" tool_tip="Kamera nach rechts rollen" />
 						<slider_bar name="zoom_slider" tool_tip="Hierdurch wird die Kamera hinein- und herausbewegt. HINWEIS: Es handelt sich hierbei nicht um einen Zoom wie im echten Leben, diese Einstellung hat keinen Effekt auf das Sichtfeld der Kamera. Für echtes Zoomen muss der Regler „Sichtwinkel“ verwendet werden!"/>
 						<joystick_track name="cam_track_stick" tool_tip="Kamera nach oben, unten, links und rechts bewegen"/>
 					</panel>

From 962214a90cb13ae67c2b11afd66f077bce82f6a7 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Mon, 7 Oct 2024 20:37:09 +0100
Subject: [PATCH 05/21] FIRE-34600 - minimise the change by using  default
 operators

we're never realistically gonna mess with the memory order to optimise particles so just go with the easy option
---
 indra/newview/llviewerpartsim.cpp | 71 +++++++++----------------------
 indra/newview/llviewerpartsim.h   | 35 +++------------
 2 files changed, 25 insertions(+), 81 deletions(-)

diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp
index eccbb5722c..69b3226ec2 100644
--- a/indra/newview/llviewerpartsim.cpp
+++ b/indra/newview/llviewerpartsim.cpp
@@ -82,7 +82,7 @@ LLViewerPart::LLViewerPart() :
     mPartSourcep = NULL;
     mParent = NULL;
     mChild = NULL;
-    LLViewerPartSim::incParticleCount2( 1 ); // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
+    ++LLViewerPartSim::sParticleCount2 ;
 }
 
 LLViewerPart::~LLViewerPart()
@@ -107,7 +107,7 @@ LLViewerPart::~LLViewerPart()
 
     mPartSourcep = NULL;
 
-    LLViewerPartSim::decParticleCount2( 1 ); // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
+    --LLViewerPartSim::sParticleCount2 ;
 }
 
 void LLViewerPart::init(LLPointer<LLViewerPartSource> sourcep, LLViewerTexture *imagep, LLVPCallback cb)
@@ -205,7 +205,7 @@ LLViewerPartGroup::~LLViewerPartGroup()
     }
     mParticles.clear();
 
-    LLViewerPartSim::decParticleCount(count); // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
+    LLViewerPartSim::sParticleCount -= count; // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
 }
 
 void LLViewerPartGroup::cleanup()
@@ -268,7 +268,7 @@ bool LLViewerPartGroup::addPart(LLViewerPart* part, F32 desired_size)
 
     mParticles.push_back(part);
     part->mSkipOffset=mSkippedTime;
-    LLViewerPartSim::incParticleCount(1); // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
+    ++LLViewerPartSim::sParticleCount; // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
     return true;
 }
 
@@ -279,15 +279,11 @@ void LLViewerPartGroup::updateParticles(const F32 lastdt)
 
     LLVector3 gravity(0.f, 0.f, GRAVITY);
 
-    // <FS:Beq> FIRE-34600 off by one particle count triggering bugsplat (LL_ERR)
-    S32 end = (S32) mParticles.size();
     LLViewerPartSim::checkParticleCount(static_cast<U32>(mParticles.size()));
-    std::atomic_signal_fence(std::memory_order_seq_cst);
-    // </FS:Beq>
 
     LLViewerCamera* camera = LLViewerCamera::getInstance();
     LLViewerRegion *regionp = getRegion();
-    //S32 end = (S32) mParticles.size();// <FS:Beq> FIRE-34600 off by one particle count triggering bugsplat (LL_ERR)
+    S32 end = (S32) mParticles.size();
     for (S32 i = 0 ; i < (S32)mParticles.size();)
     {
         LLVector3 a(0.f, 0.f, 0.f);
@@ -432,7 +428,7 @@ void LLViewerPartGroup::updateParticles(const F32 lastdt)
         {
             gPipeline.markRebuild(mVOPartGroupp->mDrawable, LLDrawable::REBUILD_ALL);
         }
-        LLViewerPartSim::decParticleCount(removed); // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
+        LLViewerPartSim::sParticleCount -= removed; // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
     }
 
     // Kill the viewer object if this particle group is empty
@@ -478,22 +474,14 @@ void LLViewerPartGroup::removeParticlesByID(const U32 source_id)
 //static
 void LLViewerPartSim::checkParticleCount(U32 size)
 {
-    // <FS:Beq> FIRE-34600 - bugsplat AVX2 particle count mismatch
-    // if(LLViewerPartSim::sParticleCount2 != LLViewerPartSim::sParticleCount)
-    S32 count = LLViewerPartSim::getParticleCount();
-    S32 count2 = LLViewerPartSim::getParticleCount2();
-    if( count != count2 ) 
-    // <FS:Beq/>
+    if(LLViewerPartSim::sParticleCount2 != LLViewerPartSim::sParticleCount)
     {
-        LL_ERRS() << "sParticleCount: " << count << " ; sParticleCount2: " << count2 << LL_ENDL ; //<FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
+        LL_ERRS() << "sParticleCount: " << LLViewerPartSim::sParticleCount << " ; sParticleCount2: " << LLViewerPartSim::sParticleCount2 << LL_ENDL ;
     }
 
-    // <FS:Beq> FIRE-34600 - bugsplat AVX2 particle count mismatch
-    // if(size > (U32)LLViewerPartSim::sParticleCount2)
-    if( size > static_cast<U32>(count2) )
-    // <FS:Beq/>
+    if(size > (U32)LLViewerPartSim::sParticleCount2)
     {
-        LL_ERRS() << "current particle size: " << count2 << " array size: " << size << LL_ENDL ; // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
+        LL_ERRS() << "current particle size: " << LLViewerPartSim::sParticleCount2 << " array size: " << size << LL_ENDL ; // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
     }
 }
 
@@ -539,18 +527,14 @@ void LLViewerPartSim::destroyClass()
 //static
 bool LLViewerPartSim::shouldAddPart()
 {
-    // <FS:Beq> FIRE-34600 - bugsplat AVX2 particle count mismatch
-    // if (sParticleCount < MAX_PART_COUNT)
-    auto count = LLViewerPartSim::getParticleCount();
-    if ( count >= MAX_PART_COUNT)
-    // <FS:Beq/>
+    if (sParticleCount < MAX_PART_COUNT)
     {
         return false;
     }
 
-    if ( count > PART_THROTTLE_THRESHOLD*sMaxParticleCount) // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
+    if ( sParticleCount > PART_THROTTLE_THRESHOLD*sMaxParticleCount)
     {
-        F32 frac = (F32)count/(F32)sMaxParticleCount; // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
+        F32 frac = (F32)sParticleCount/(F32)sMaxParticleCount;
         frac -= PART_THROTTLE_THRESHOLD;
         frac *= PART_THROTTLE_RESCALE;
         if (ll_frand() < frac)
@@ -572,7 +556,7 @@ bool LLViewerPartSim::shouldAddPart()
 
 void LLViewerPartSim::addPart(LLViewerPart* part)
 {
-    if (LLViewerPartSim::getParticleCount() < MAX_PART_COUNT)
+    if (LLViewerPartSim::sParticleCount < MAX_PART_COUNT)
     {
         put(part);
     }
@@ -806,19 +790,14 @@ void LLViewerPartSim::updateSimulation()
     }
     if (LLDrawable::getCurrentFrame()%16==0)
     {
-        // <FS:Beq> FIRE-34600 - bugsplat AVX2 particle count mismatch
-        // if (sParticleCount > sMaxParticleCount * 0.875f
-        //      && sParticleAdaptiveRate < 2.0f)
-        auto count = LLViewerPartSim::getParticleCount();
-        if ( count > sMaxParticleCount * 0.875f
-            && sParticleAdaptiveRate < 2.0f)
-        // <FS:Beq/>
+        if (sParticleCount > sMaxParticleCount * 0.875f
+             && sParticleAdaptiveRate < 2.0f)
         {
             sParticleAdaptiveRate *= PART_ADAPT_RATE_MULT;
         }
         else
         {
-            if ( count < sMaxParticleCount * 0.5f // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
+            if ( sParticleCount < sMaxParticleCount * 0.5f
                 && sParticleAdaptiveRate > 0.03125f)
             {
                 sParticleAdaptiveRate *= PART_ADAPT_RATE_MULT_RECIP;
@@ -835,25 +814,15 @@ void LLViewerPartSim::updatePartBurstRate()
 {
     if (!(LLDrawable::getCurrentFrame() & 0xf))
     {
-        // <FS:Beq> FIRE-34600 - bugsplat AVX2 particle count mismatch
-        // if (sParticleCount >= MAX_PART_COUNT) //set rate to zero
-        auto count = LLViewerPartSim::getParticleCount();
-        if (count >= MAX_PART_COUNT) //set rate to zero
-        // <FS:Beq/>
+        if (sParticleCount >= MAX_PART_COUNT) //set rate to zero
         {
             sParticleBurstRate = 0.0f ;
         }
-        // <FS:Beq> FIRE-34600 - bugsplat AVX2 particle count mismatch
-        // else if(sParticleCount > 0)
-        else if (count > 0)
-        // <FS:Beq/>
+        else if(sParticleCount > 0)
         {
             if(sParticleBurstRate > 0.0000001f)
             {
-                // <FS:Beq> FIRE-34600 - bugsplat AVX2 particle count mismatch
-                // F32 total_particles = sParticleCount / sParticleBurstRate ; //estimated
-                F32 total_particles = count / sParticleBurstRate ; //estimated
-                // <FS:Beq/>
+                F32 total_particles = sParticleCount / sParticleBurstRate ; //estimated
                 F32 new_rate = llclamp(0.9f * sMaxParticleCount / total_particles, 0.0f, 1.0f) ;
                 F32 delta_rate_threshold = llmin(0.1f * llmax(new_rate, sParticleBurstRate), 0.1f) ;
                 F32 delta_rate = llclamp(new_rate - sParticleBurstRate, -1.0f * delta_rate_threshold, delta_rate_threshold) ;
diff --git a/indra/newview/llviewerpartsim.h b/indra/newview/llviewerpartsim.h
index 3e92a1988d..6c7eaf4e1f 100644
--- a/indra/newview/llviewerpartsim.h
+++ b/indra/newview/llviewerpartsim.h
@@ -155,25 +155,14 @@ public:
     static bool shouldAddPart(); // Just decides whether this particle should be added or not (for particle count capping)
     F32 maxRate() // Return maximum particle generation rate
     {
-        // <FS:Beq> FIRE-34600 - bugsplat AVX2 particle count mismatch
-        // if (sParticleCount >= MAX_PART_COUNT)
-        // {
-        //     return 1.f;
-        // }
-        // if (sParticleCount > PART_THROTTLE_THRESHOLD*sMaxParticleCount)
-        // {
-        //     return (((F32)sParticleCount/(F32)sMaxParticleCount)-PART_THROTTLE_THRESHOLD)*PART_THROTTLE_RESCALE;
-        // }
-        const auto count = getParticleCount(); 
-        if ( count >= MAX_PART_COUNT)
+        if (sParticleCount >= MAX_PART_COUNT)
         {
             return 1.f;
         }
-        if ( count > PART_THROTTLE_THRESHOLD*sMaxParticleCount)
+        if (sParticleCount > PART_THROTTLE_THRESHOLD*sMaxParticleCount)
         {
-            return (((F32)count/(F32)sMaxParticleCount)-PART_THROTTLE_THRESHOLD)*PART_THROTTLE_RESCALE;
+            return (((F32)sParticleCount/(F32)sMaxParticleCount)-PART_THROTTLE_THRESHOLD)*PART_THROTTLE_RESCALE;
         }
-        // </FS:Beq>
         return 0.f;
     }
     F32 getRefRate() { return sParticleAdaptiveRate; }
@@ -188,29 +177,15 @@ public:
 
     friend class LLViewerPartGroup;
 
-    // <FS:Beq> FIRE-34600 - bugsplat AVX2 particle count mismatch
-    // bool aboveParticleLimit() const { return sParticleCount > sMaxParticleCount; }
-    bool aboveParticleLimit() const { return getParticleCount() > sMaxParticleCount; }
-    // </FS:Beq>
+    bool aboveParticleLimit() const { return sParticleCount > sMaxParticleCount; }
     static void setMaxPartCount(const S32 max_parts)    { sMaxParticleCount = max_parts; }
     static S32  getMaxPartCount()                       { return sMaxParticleCount; }
 
     // <FS:Beq> FIRE-34600 - bugsplat AVX2 particle count mismatch
+    // Deprecate these and use native operators for consistency
     // static void incPartCount(const S32 count)           { sParticleCount += count; }
     // static void decPartCount(const S32 count)           { sParticleCount -= count; }
-    static void incParticleCount(const S32 count, std::memory_order order = std::memory_order_seq_cst ) 
-                                                        { sParticleCount.fetch_add( count , std::memory_order_seq_cst ); }
-    static void decParticleCount(const S32 count, std::memory_order order = std::memory_order_seq_cst )          
-                                                        { sParticleCount.fetch_sub( count , std::memory_order_seq_cst ); }
-    static void incParticleCount2(const S32 count, std::memory_order order = std::memory_order_seq_cst ) 
-                                                        { sParticleCount2.fetch_add( count , std::memory_order_seq_cst ); }
-    static void decParticleCount2(const S32 count, std::memory_order order = std::memory_order_seq_cst )          
-                                                        { sParticleCount2.fetch_sub( count , std::memory_order_seq_cst ); }
-    static inline S32 getParticleCount(std::memory_order order = std::memory_order_seq_cst) { return sParticleCount.load(order); }
-
-    static inline S32 getParticleCount2(std::memory_order order = std::memory_order_seq_cst) { return sParticleCount2.load(order); }
     // </FS:Beq>
-
     U32 mID;
 
 protected:

From bb9bea4a5659466ea8a4a1cb0058cd16428f7c1c Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Tue, 8 Oct 2024 18:36:30 +0100
Subject: [PATCH 06/21] Fix the AVX2 logic checks

I derped the check in viewer_mainfest so all builds seemed like AVX to the installer
The weird NSIS DSL also has weird behaviour in the if statements so I've reworked that and also added a "open in new window" for the download page offer.
---
 .../installers/windows/installer_template.nsi | 73 +++++++++++++++----
 indra/newview/viewer_manifest.py              |  2 +-
 2 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index e0c515917b..1018b3d6db 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -178,9 +178,57 @@ Var FRIENDLY_APP_NAME   # <FS:Ansariel> FIRE-30446: Set FriendlyAppName for prot
 Function dirPre
     StrCmp $SKIP_DIALOGS "true" 0 +2
 	Abort
-
 FunctionEnd    
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Open link in a new browser window
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function openLinkNewWindow
+  Push $3
+  Exch
+  Push $2
+  Exch
+  Push $1
+  Exch
+  Push $0
+  Exch
+ 
+  ReadRegStr $0 HKCR "http\shell\open\command" ""
+# Get browser path
+    DetailPrint $0
+  StrCpy $2 '"'
+  StrCpy $1 $0 1
+  StrCmp $1 $2 +2 # if path is not enclosed in " look for space as final char
+    StrCpy $2 ' '
+  StrCpy $3 1
+  loop:
+    StrCpy $1 $0 1 $3
+    DetailPrint $1
+    StrCmp $1 $2 found
+    StrCmp $1 "" found
+    IntOp $3 $3 + 1
+    Goto loop
+ 
+  found:
+    StrCpy $1 $0 $3
+    StrCmp $2 " " +2
+      StrCpy $1 '$1"'
+ 
+  Pop $0
+  Exec '$1 $0'
+  Pop $0
+  Pop $1
+  Pop $2
+  Pop $3
+FunctionEnd
+ 
+!macro _OpenURL URL
+Push "${URL}"
+Call openLinkNewWindow
+!macroend
+ 
+!define OpenURL '!insertmacro "_OpenURL"'
+
 ; Add the AVX2 check functions
 Function CheckCPUFlagsAVX2
     Push $1
@@ -188,6 +236,7 @@ Function CheckCPUFlagsAVX2
     IntCmp $1 1 OK_AVX2
     ; AVX2 not supported
     MessageBox MB_OK $(MissingAVX2)
+    ${OpenURL} 'https://www.firestormviewer.org/early-access-beta-downloads-legacy-cpus'
     Quit
 
   OK_AVX2:
@@ -198,23 +247,17 @@ FunctionEnd
 Function CheckCPUFlagsAVX2_Prompt
     Push $1
     System::Call 'kernel32::IsProcessorFeaturePresent(i 40) i .r1'  ; 40 is PF_AVX2_INSTRUCTIONS_AVAILABLE
-    IntCmp $1 1 OK_AVX2 Not_AVX2
-
+    IntCmp $1 1 OK_AVX2 
+    Pop $1
+    Return
   OK_AVX2:
     MessageBox MB_YESNO $(AVX2Available) IDYES DownloadAVX2 IDNO ContinueInstall
     DownloadAVX2:
-      ExecShell open 'https://www.firestormviewer.org/early-access-beta-downloads/'
+      ${OpenURL} 'https://www.firestormviewer.org/early-access-beta-downloads/'
       Quit
     ContinueInstall:
-      Goto End
-
-  Not_AVX2:
-    ; CPU does not support AVX2, continue installation
-    Goto End
-
-  End:
-    Pop $1
-    Return
+      Pop $1
+      Return
 FunctionEnd
 
 # <FS:Ansariel> Optional start menu entry
@@ -260,6 +303,10 @@ ${If} $0 != ""
 ${EndIf}
 
 Call CheckCPUFlags							# Make sure we have SSE2 support
+
+# Two checks here, if we are an AVX2 build we want to abort if no AVX2 support on this CPU.
+# If we are not an AVX2 build but the CPU can support it then we want to prompt them to download the AVX2 version
+# but also allow them to override.
 ${If} ${ISAVX2} == 1
   Call CheckCPUFlagsAVX2
 ${Else}
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 515cdd75fd..f1e706b0dd 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -951,7 +951,7 @@ class Windows_x86_64_Manifest(ViewerManifest):
         
         substitution_strings['installer_file'] = installer_file
         substitution_strings['is64bit'] = (1 if (self.address_size == 64) else 0)
-        substitution_strings['isavx2'] = (1 if (self.fs_is_avx2) else 0)
+        substitution_strings['isavx2'] = (1 if (self.fs_is_avx2()) else 0)
         substitution_strings['is_opensim'] = self.fs_is_opensim() # <FS:Ansariel> FIRE-30446: Register hop-protocol for OS version only
         substitution_strings['friendly_app_name'] = self.friendly_app_name() # <FS:Ansariel> FIRE-30446: Set FriendlyAppName for protocol registrations
         substitution_strings['icon_suffix'] = ("_os" if (self.fs_is_opensim()) else "") # <FS:Ansariel> FIRE-24335: Use different icon for OpenSim version

From 3873b2221807d2d52b9ca111eecb4c3993af3ac9 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Tue, 8 Oct 2024 18:45:16 +0100
Subject: [PATCH 07/21] FIRE-34600 - updateParticles AVX2 bug again

Let's be more strict about the access to the vector.
---
 indra/newview/llviewerpartsim.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp
index 69b3226ec2..8f3190a499 100644
--- a/indra/newview/llviewerpartsim.cpp
+++ b/indra/newview/llviewerpartsim.cpp
@@ -399,8 +399,7 @@ void LLViewerPartGroup::updateParticles(const F32 lastdt)
         // Kill dead particles (either flagged dead, or too old)
         if ((part->mLastUpdateTime > part->mMaxAge) || (LLViewerPart::LL_PART_DEAD_MASK == part->mFlags))
         {
-            mParticles[i] = mParticles.back() ;
-            mParticles.pop_back() ;
+            vector_replace_with_last(mParticles, mParticles.begin() + i); // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
             delete part ;
         }
         else
@@ -410,8 +409,7 @@ void LLViewerPartGroup::updateParticles(const F32 lastdt)
             {
                 // Transfer particles between groups
                 LLViewerPartSim::getInstance()->put(part) ;
-                mParticles[i] = mParticles.back() ;
-                mParticles.pop_back() ;
+                vector_replace_with_last(mParticles, mParticles.begin() + i); // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
             }
             else
             {

From 25c57c8199a42e3f5a85e42b8fd46ab7e864d44a Mon Sep 17 00:00:00 2001
From: simonlsalt <simonlsalt@gmail.com>
Date: Tue, 8 Oct 2024 18:50:21 +0100
Subject: [PATCH 08/21] FIRE-34629 Add an "eye" button on the login screen
 allowing visible text for passwords

---
 indra/newview/fspanellogin.cpp                | 36 +++++++++++++++++++
 indra/newview/fspanellogin.h                  |  4 +++
 .../skins/default/xui/en/panel_fs_login.xml   | 24 +++++++++++++
 .../default/xui/en/panel_fs_nui_login.xml     | 24 +++++++++++++
 4 files changed, 88 insertions(+)

diff --git a/indra/newview/fspanellogin.cpp b/indra/newview/fspanellogin.cpp
index 09a45e199d..4ccc60194f 100644
--- a/indra/newview/fspanellogin.cpp
+++ b/indra/newview/fspanellogin.cpp
@@ -191,6 +191,7 @@ FSPanelLogin::FSPanelLogin(const LLRect &rect,
     setBackgroundOpaque(true);
 
     mPasswordModified = false;
+    mShowPassword     = false;
 
     sInstance = this;
 
@@ -316,6 +317,10 @@ FSPanelLogin::FSPanelLogin(const LLRect &rect,
     username_combo->setFocusLostCallback(boost::bind(&FSPanelLogin::onSelectUser, this));
     mPreviousUsername = username_combo->getValue().asString();
 
+    childSetAction("password_show_btn", onShowHidePasswordClick, this);
+    childSetAction("password_hide_btn", onShowHidePasswordClick, this);
+    syncShowHidePasswordButton();
+
     mInitialized = true;
 }
 
@@ -1058,6 +1063,37 @@ void FSPanelLogin::onClickForgotPassword(void*)
     }
 }
 
+// static
+void FSPanelLogin::onShowHidePasswordClick(void*)
+{
+    if (sInstance)
+    {  // mShowPassword is not saved between sessions, it's just for short-term use
+        sInstance->mShowPassword = !sInstance->mShowPassword;
+        LL_INFOS("AppInit") << "Showing password text now " << (sInstance->mShowPassword ? "on" : "off") << LL_ENDL;
+
+        sInstance->syncShowHidePasswordButton();
+    }
+}
+
+
+void FSPanelLogin::syncShowHidePasswordButton()
+{   // Show or hide the two 'eye' buttons for password visibility
+    LLButton* show_password_btn = sInstance->findChild<LLButton>("password_show_btn");
+    if (show_password_btn)
+    {
+        show_password_btn->setVisible(!mShowPassword);
+    }
+    LLButton* hide_password_btn = sInstance->findChild<LLButton>("password_hide_btn");
+    if (hide_password_btn)
+    {
+        hide_password_btn->setVisible(mShowPassword);
+    }
+
+    // Update the edit field to replace password text with dots ... or not.  Will redraw
+    sInstance->getChild<LLLineEditor>("password_edit")->setDrawAsterixes(!mShowPassword);
+}
+
+
 //static
 void FSPanelLogin::onClickHelp(void*)
 {
diff --git a/indra/newview/fspanellogin.h b/indra/newview/fspanellogin.h
index 9a817c0bcf..dc256dbd93 100644
--- a/indra/newview/fspanellogin.h
+++ b/indra/newview/fspanellogin.h
@@ -98,6 +98,7 @@ private:
     void onSelectServer();
     void onLocationSLURL();
     void onUsernameTextChanged();
+    void syncShowHidePasswordButton();          // Update which button is shown based on mShowPassword
 
     static void onClickConnect(void*);
     static void onClickNewAccount(void*);
@@ -110,6 +111,7 @@ private:
     static void onRemoveCallback(const LLSD& notification, const LLSD& response);
     static void onClickGridMgrHelp(void*);
     static void onClickGridBuilder(void*);
+    static void onShowHidePasswordClick(void*);
     static std::string credentialName();
 
 private:
@@ -121,6 +123,8 @@ private:
     void*           mCallbackData;
 
     bool            mPasswordModified;
+    bool            mShowPassword;  // Show password in normal text vs. hidden by dots
+
     bool            mShowFavorites;
 
     static FSPanelLogin* sInstance;
diff --git a/indra/newview/skins/default/xui/en/panel_fs_login.xml b/indra/newview/skins/default/xui/en/panel_fs_login.xml
index eb071fed6a..45ee5e2890 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_login.xml
@@ -274,6 +274,30 @@
           top_pad="1"
           name="remember_check"
           width="145" />
+      <button
+          name="password_show_btn"
+          tool_tip="Show password text"
+          follows="left|bottom"
+          left="256"
+          bottom_delta="0"
+          height="20"
+          width="20"
+          image_pressed="Profile_Group_Visibility_Off_Pressed"
+          image_unselected="Profile_Group_Visibility_Off"
+          tab_stop="false"
+          visible="true"  />
+        <button
+          name="password_hide_btn"
+          tool_tip="Hide password text"
+          follows="left|bottom"
+          left="256"
+          bottom_delta="0"
+          height="20"
+          width="20"
+          image_pressed="Profile_Group_Visibility_On_Pressed"
+          image_unselected="Profile_Group_Visibility_On"
+          tab_stop="false"
+          visible="false"  />
     </layout_panel>
     <layout_panel
         tab_stop="false"
diff --git a/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
index edd1b2003e..799fb30262 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
@@ -184,6 +184,30 @@
       top_pad="10"
       name="remember_check"
       width="204" />
+    <button
+      name="password_show_btn"
+      tool_tip="Show password text"
+      follows="left|bottom"
+      left="194"
+      bottom_delta="0"
+      height="20"
+      width="20"
+      image_pressed="Profile_Group_Visibility_Off_Pressed"
+      image_unselected="Profile_Group_Visibility_Off"
+      tab_stop="false"
+      visible="true"  />
+    <button
+      name="password_hide_btn"
+      tool_tip="Hide password text"
+      follows="left|bottom"
+      left="194"
+      bottom_delta="0"
+      height="20"
+      width="20"
+      image_pressed="Profile_Group_Visibility_On_Pressed"
+      image_unselected="Profile_Group_Visibility_On"
+      tab_stop="false"
+      visible="false"  />
     </layout_panel> <!-- password_container -->
     <layout_panel
       auto_resize="false"

From 128b071ec80a317352f361394914478b4d410f7f Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 9 Oct 2024 15:59:02 +0200
Subject: [PATCH 09/21] Update German translation

---
 indra/newview/skins/default/xui/de/panel_fs_login.xml     | 2 ++
 indra/newview/skins/default/xui/de/panel_fs_nui_login.xml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/indra/newview/skins/default/xui/de/panel_fs_login.xml b/indra/newview/skins/default/xui/de/panel_fs_login.xml
index 3f5cb17650..1a85606a5a 100644
--- a/indra/newview/skins/default/xui/de/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/de/panel_fs_login.xml
@@ -51,6 +51,8 @@
 			<button label="Anmelden" name="connect_btn"/>
 			<check_box label="Benutzername speichern" name="remember_username_check"/>
 			<check_box label="Kennwort speichern" name="remember_check"/>
+			<button name="password_show_btn" tool_tip="Passwort anzeigen"/>
+			<button name="password_hide_btn" tool_tip="Passwort verstecken"/>
 		</layout_panel>
 		<layout_panel name="mode_selection">
 			<text name="mode_selection_text">
diff --git a/indra/newview/skins/default/xui/de/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/de/panel_fs_nui_login.xml
index b5e3865d9d..3cf8cffbe3 100644
--- a/indra/newview/skins/default/xui/de/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/de/panel_fs_nui_login.xml
@@ -21,6 +21,8 @@
 						<layout_panel name="password_container">
 							<line_editor name="password_edit" label="Kennwort"/>
 							<check_box label="Kennwort speichern" name="remember_check"/>
+							<button name="password_show_btn" tool_tip="Passwort anzeigen"/>
+							<button name="password_hide_btn" tool_tip="Passwort verstecken"/>
 						</layout_panel>
 						<layout_panel name="start_location_panel">
 							<combo_box name="start_location_combo" label="Hier starten:">

From 6abda681a213fd164802130ae7d76b5b8f0c51ae Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 26 Sep 2024 20:59:01 +0300
Subject: [PATCH 10/21] viewer#2653 fix texture readback not being called and
 not setting values properly

Ex: Saving textures to hard drive sometimes fails
---
 indra/newview/llviewertexture.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index eb53686e51..6bf867b8eb 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -2620,6 +2620,11 @@ bool LLViewerFetchedTexture::doLoadedCallbacks()
         }
     }
 
+    if (need_readback)
+    {
+        readbackRawImage();
+    }
+
     //
     // Run raw/auxiliary data callbacks
     //
@@ -2869,10 +2874,22 @@ void LLViewerFetchedTexture::readbackRawImage()
     if (mGLTexturep.notNull() && mGLTexturep->getTexName() != 0 &&
         (mRawImage.isNull() || mRawImage->getWidth() < mGLTexturep->getWidth() || mRawImage->getHeight() < mGLTexturep->getHeight() ))
     {
+        if (mRawImage.isNull())
+        {
+            sRawCount++;
+        }
         mRawImage = new LLImageRaw();
         if (!mGLTexturep->readBackRaw(-1, mRawImage, false))
         {
             mRawImage = nullptr;
+            mIsRawImageValid = false;
+            mRawDiscardLevel = INVALID_DISCARD_LEVEL;
+            sRawCount--;
+        }
+        else
+        {
+            mIsRawImageValid = true;
+            mRawDiscardLevel = mGLTexturep->getDiscardLevel();
         }
     }
 }

From 6963d76355384ca2e44291678b9650a30e1111cf Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Fri, 11 Oct 2024 17:21:50 +0100
Subject: [PATCH 11/21] FIRE-34645 - Fix object chatter particles not showing

---
 indra/newview/llviewerpartsim.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp
index 8f3190a499..34807a1819 100644
--- a/indra/newview/llviewerpartsim.cpp
+++ b/indra/newview/llviewerpartsim.cpp
@@ -525,7 +525,7 @@ void LLViewerPartSim::destroyClass()
 //static
 bool LLViewerPartSim::shouldAddPart()
 {
-    if (sParticleCount < MAX_PART_COUNT)
+    if (sParticleCount >= MAX_PART_COUNT)
     {
         return false;
     }

From a165425143e7df2e7d93a905de356595ab7bc8d7 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Fri, 11 Oct 2024 19:57:13 +0200
Subject: [PATCH 12/21] FIRE-34649, FIRE-34646 Updated French (Laurent Bechir),
 Russian (Romka Swallowtail) and Polish translations

---
 indra/newview/skins/default/xui/fr/floater_bulk_upload.xml  | 4 ++--
 .../skins/default/xui/fr/floater_phototools_camera.xml      | 2 ++
 indra/newview/skins/default/xui/fr/menu_inventory_add.xml   | 5 +++--
 indra/newview/skins/default/xui/fr/menu_viewer.xml          | 3 ++-
 indra/newview/skins/default/xui/fr/panel_fs_login.xml       | 6 ++++--
 indra/newview/skins/default/xui/fr/panel_fs_nui_login.xml   | 6 ++++--
 .../skins/default/xui/pl/floater_phototools_camera.xml      | 2 ++
 indra/newview/skins/default/xui/pl/panel_fs_login.xml       | 2 ++
 indra/newview/skins/default/xui/pl/panel_fs_nui_login.xml   | 2 ++
 .../skins/default/xui/ru/floater_phototools_camera.xml      | 4 ++++
 indra/newview/skins/default/xui/ru/panel_fs_login.xml       | 2 ++
 indra/newview/skins/default/xui/ru/panel_fs_nui_login.xml   | 2 ++
 12 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/indra/newview/skins/default/xui/fr/floater_bulk_upload.xml b/indra/newview/skins/default/xui/fr/floater_bulk_upload.xml
index 7010fc5963..7e439377cc 100644
--- a/indra/newview/skins/default/xui/fr/floater_bulk_upload.xml
+++ b/indra/newview/skins/default/xui/fr/floater_bulk_upload.xml
@@ -3,7 +3,7 @@
 	<layout_stack name="maint_layout">
 		<layout_panel name="count_panel">
 			<text name="number_of_items">
-				Éléments à envoyer : [COUNT]
+				Éléments à charger : [COUNT]
 			</text>
 		</layout_panel>
 		<layout_panel name="warning_panel">
@@ -20,7 +20,7 @@
 			</text>
 		</layout_panel>
 		<layout_panel name="buttoms_panel">
-			<button label="Envoyer" name="upload_btn" />
+			<button label="Charger" name="upload_btn" />
 			<button label="Annuler" name="cancel_btn" />
 		</layout_panel>
 		<layout_panel name="link_panel">
diff --git a/indra/newview/skins/default/xui/fr/floater_phototools_camera.xml b/indra/newview/skins/default/xui/fr/floater_phototools_camera.xml
index dd859911eb..bf86997126 100644
--- a/indra/newview/skins/default/xui/fr/floater_phototools_camera.xml
+++ b/indra/newview/skins/default/xui/fr/floater_phototools_camera.xml
@@ -56,6 +56,8 @@
 					</panel>
 					<panel name="zoom">
 						<joystick_rotate name="cam_rotate_stick" tool_tip="Fait tourner la caméra autour du focus"/>
+						<button name="roll_left" tool_tip="Faire pivoter la caméra vers la gauche"/>
+						<button name="roll_right" tool_tip="Faire pivoter la caméra vers la droite"/>
 						<slider_bar name="zoom_slider" tool_tip="Fait simplement bouger la caméra. NOTE :  Il ne s'agit pas d'un vrai zoom, ce réglage n'a aucun effet sur le champ de vision de la caméra. Pour un vrai zoom, il faut utiliser le curseur Angle de vue"/>
 						<joystick_track name="cam_track_stick" tool_tip="Déplacer la caméra vers le haut, le bas, la gauche et la droite"/>
 					</panel>
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml
index 56df11387e..ac991e4695 100644
--- a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml
@@ -4,8 +4,9 @@
 		<menu_item_call label="Image..." name="Upload Image"/>
 		<menu_item_call label="Son (L$[COST])..." name="Upload Sound"/>
 		<menu_item_call label="Animation (L$[COST])..." name="Upload Animation"/>
-		<menu_item_call label="Mesh..." name="Upload Model"/>
-		<menu_item_call label="En Bloc..." name="Bulk Upload"/>
+		<menu_item_call label="Maillage..." name="Upload Model"/>
+		<menu_item_call label="Matériau PBR..." name="Upload Material"/>
+		<menu_item_call label="Par lot..." name="Bulk Upload"/>
 		<menu_item_call label="Importer un ensemble lié..." name="import linkset"/>
 	</menu>
 	<menu_item_call label="Nouveau dossier" name="New Folder"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index a5c0ed296f..4324587657 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -242,7 +242,8 @@
 			<menu_item_call label="Son ([COST] L$)..." name="Upload Sound"/>
 			<menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/>
 			<menu_item_call label="Modèle..." name="Upload Model"/>
-			<menu_item_call label="Lot..." name="Bulk Upload"/>
+			<menu_item_call label="Matériau PBR..." name="Upload Material"/>
+			<menu_item_call label="Par lot..." name="Bulk Upload"/>
 			<menu_item_call label="Importer un groupe d'objets" name="import linkset"/>
 		</menu>
 		<menu_item_call label="Maillage local" name="local_mesh"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_fs_login.xml b/indra/newview/skins/default/xui/fr/panel_fs_login.xml
index f3e1c749ac..2d18930c10 100644
--- a/indra/newview/skins/default/xui/fr/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/fr/panel_fs_login.xml
@@ -26,8 +26,10 @@
 			<text name="create_new_account_text">S'enregistrer</text>
 			<text name="forgot_password_text">Mot de passe/Nom d'utilisateur oublié ?</text>
 			<button label="Connexion" name="connect_btn"/>
-			<check_box label="Mémoriser le nom d'utilisateur" name="remember_username_check"/>
-			<check_box label="Mémoriser le mot de passe" name="remember_check"/>
+			<check_box label="Enr. le nom" name="remember_username_check"/>
+			<check_box label="Enr. le mot de passe" name="remember_check"/>
+			<button name="password_show_btn" tool_tip="Afficher le mot de passe"/>
+			<button name="password_hide_btn" tool_tip="Masquer le mot de passe"/>
 		</layout_panel>
 		<layout_panel name="mode_selection">
 			<text name="mode_selection_text">MODE DE CONNEXION</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/fr/panel_fs_nui_login.xml
index f0d8968d49..1df6f6e55f 100644
--- a/indra/newview/skins/default/xui/fr/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/fr/panel_fs_nui_login.xml
@@ -13,14 +13,16 @@
 					<layout_stack name="1st_row_stack">
 						<layout_panel name="login">
 							<combo_box name="username_combo" label="Nom de résident(e) :" tool_tip="Le nom de compte que vous avez choisi lors de votre inscription, par exemple, bobsmith420 ou Steller Sunshine"/>
-							<check_box label="Mémoriser le nom de résident(e)" name="remember_username_check"/>
+							<check_box label="Enr. le nom" name="remember_username_check"/>
 						</layout_panel>
 						<layout_panel name="delete_container">
 							<button tool_tip="Supprimer ce nom de résident(e)" name="remove_user_btn"/>
 						</layout_panel>
 						<layout_panel name="password_container">
 							<line_editor name="password_edit" label="Mot de passe"/>
-							<check_box label="Mémoriser le mot de passe" name="remember_check"/>
+							<check_box label="Enr. le mot de passe" name="remember_check"/>
+							<button name="password_show_btn" tool_tip="Afficher le mot de passe"/>
+							<button name="password_hide_btn" tool_tip="Masquer le mot de passe"/>
 						</layout_panel>
 						<layout_panel name="start_location_panel">
 							<combo_box name="start_location_combo" label="Démarrer :">
diff --git a/indra/newview/skins/default/xui/pl/floater_phototools_camera.xml b/indra/newview/skins/default/xui/pl/floater_phototools_camera.xml
index b0ec961ddc..7f1702f4c6 100644
--- a/indra/newview/skins/default/xui/pl/floater_phototools_camera.xml
+++ b/indra/newview/skins/default/xui/pl/floater_phototools_camera.xml
@@ -55,6 +55,8 @@
 					</panel>
 					<panel name="zoom">
 						<joystick_rotate name="cam_rotate_stick" tool_tip="Obróć kamerę wokół punktu skupienia"/>
+						<button name="roll_left" tool_tip="Przechyl kamerę w lewo" />
+						<button name="roll_right" tool_tip="Przechyl kamerę w prawo" />
 						<slider_bar name="zoom_slider" tool_tip="Ta opcja po prostu przesuwa kamerę w przód i w tył. UWAGA: To nie ma nic wspólnego z opcją powiększania (zoomowania) z prawdziwego życia! Nie ma żadnego wpływu na pole widzenia (FOV). Użyj suwaka 'Kąt widzenia', aby uzyskać prawdziwy efekt zoomowania."/>
 						<joystick_track name="cam_track_stick" tool_tip="Poruszaj kamerą w górę, w dół, w lewo i w prawo."/>
 					</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_fs_login.xml b/indra/newview/skins/default/xui/pl/panel_fs_login.xml
index dbb2a84c4f..82bbe7475a 100644
--- a/indra/newview/skins/default/xui/pl/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/pl/panel_fs_login.xml
@@ -45,6 +45,8 @@
 			<button label="Zaloguj" name="connect_btn"/>
 			<check_box label="Zapamiętaj login" name="remember_username_check"/>
 			<check_box label="Zapamiętaj hasło" name="remember_check"/>
+			<button name="password_show_btn" tool_tip="Pokaż hasło" />
+			<button name="password_hide_btn" tool_tip="Ukryj hasło" />
 		</layout_panel>
 		<layout_panel name="mode_selection">
 			<text name="mode_selection_text">
diff --git a/indra/newview/skins/default/xui/pl/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/pl/panel_fs_nui_login.xml
index 08af7c43a2..74df14f957 100644
--- a/indra/newview/skins/default/xui/pl/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/pl/panel_fs_nui_login.xml
@@ -18,6 +18,8 @@
 						<layout_panel name="password_container">
 							<line_editor name="password_edit" label="Hasło" />
 							<check_box label="Zapamiętaj hasło" name="remember_check" />
+							<button name="password_show_btn" tool_tip="Pokaż hasło" />
+							<button name="password_hide_btn" tool_tip="Ukryj hasło" />
 						</layout_panel>
 						<layout_panel name="start_location_panel">
 							<combo_box label="Rozpocznij w" name="start_location_combo">
diff --git a/indra/newview/skins/default/xui/ru/floater_phototools_camera.xml b/indra/newview/skins/default/xui/ru/floater_phototools_camera.xml
index bc6ed23f30..228c5e25c6 100644
--- a/indra/newview/skins/default/xui/ru/floater_phototools_camera.xml
+++ b/indra/newview/skins/default/xui/ru/floater_phototools_camera.xml
@@ -54,6 +54,10 @@
 					<!--TODO: replace + - images -->
 					<panel name="zoom">
 						<joystick_rotate name="cam_rotate_stick" tool_tip="Орбита камеры вокруг фокуса"/>
+						<!-- <FS:Beq> FIRE-34509 Add Camera roll -->
+						<button name="roll_left" tool_tip="Повернуть камеру влево"/>
+						<button name="roll_right" tool_tip="Повернуть камеру вправо"/>
+						<!-- </FS:Beq> -->
 						<slider_bar name="zoom_slider" tool_tip="Это просто перемещает камеру. ПРИМЕЧАНИЕ. Это не масштаб камеры! Это не влияет на угол обзора. Используйте ползунок «Угол обзора» для реального масштабирования."/>
 						<joystick_track name="cam_track_stick" tool_tip="Двигает камеру вверх и вниз, влево и вправо."/>
 					</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_fs_login.xml b/indra/newview/skins/default/xui/ru/panel_fs_login.xml
index a6ee2abfe8..d0f7153eff 100644
--- a/indra/newview/skins/default/xui/ru/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/ru/panel_fs_login.xml
@@ -45,6 +45,8 @@
 			<button label="Войти" name="connect_btn"/>
 			<check_box label="Запомнить пользователя" name="remember_username_check" />
 			<check_box label="Запомнить пароль" name="remember_check"/>
+			<button name="password_show_btn" tool_tip="Показать текст пароля"/>
+			<button name="password_hide_btn" tool_tip="Скрыть текст пароляt"/>
 		</layout_panel>
 		<layout_panel name="mode_selection">
 			<text name="mode_selection_text">
diff --git a/indra/newview/skins/default/xui/ru/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/ru/panel_fs_nui_login.xml
index b64cdf63c9..d629c45950 100644
--- a/indra/newview/skins/default/xui/ru/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/ru/panel_fs_nui_login.xml
@@ -19,6 +19,8 @@
             <!-- The max length might be changed in FSPanelLogin.cpp for Opensim! -->
               <line_editor name="password_edit" label="Пароль"/>
               <check_box label="Запомнить пароль" name="remember_check"/>
+              <button name="password_show_btn" tool_tip="Показать текст пароля"/>
+              <button name="password_hide_btn" tool_tip="Скрыть текст пароляt"/>
             </layout_panel> <!-- password_container -->
             <layout_panel name="start_location_panel">
               <combo_box label="Стартовое место" name="start_location_combo">

From 7a24166706483158279b96ca6820ff02ba64b649 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Mon, 14 Oct 2024 00:48:37 +0100
Subject: [PATCH 13/21] Update MacOS runners to macos-14 to avoid deprecation
 brownouts

should also fix the homebrew warnings.
---
 .github/workflows/build_viewer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml
index f6baff2a46..45d6a297e7 100644
--- a/.github/workflows/build_viewer.yml
+++ b/.github/workflows/build_viewer.yml
@@ -31,7 +31,7 @@ jobs:
   build_matrix:
     strategy:
       matrix:
-        os: [macos-12,ubuntu-22.04,windows-2022]
+        os: [macos-14,ubuntu-22.04,windows-2022]
         grid: [sl,os]
         variant: [regular, avx]
     runs-on: ${{ matrix.os }}

From 4a2e5acb84e34073bfcb5e6ae3f8cafa75a8c367 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Mon, 14 Oct 2024 01:27:12 +0100
Subject: [PATCH 14/21] Add a little more depth to the information on
 particles.

Does the mismatch persist?
If it occurs does the secodn check also fail, and does that one persist too?
---
 indra/newview/llviewerpartsim.cpp | 33 +++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp
index 34807a1819..a9713258e5 100644
--- a/indra/newview/llviewerpartsim.cpp
+++ b/indra/newview/llviewerpartsim.cpp
@@ -472,15 +472,44 @@ void LLViewerPartGroup::removeParticlesByID(const U32 source_id)
 //static
 void LLViewerPartSim::checkParticleCount(U32 size)
 {
+    // <FS:Beq> FIRE-34600 - bugsplat AVX2 particle count mismatch
+    // if(LLViewerPartSim::sParticleCount2 != LLViewerPartSim::sParticleCount)
+    // {
+    //     LL_ERRS() << "sParticleCount: " << LLViewerPartSim::sParticleCount << " ; sParticleCount2: " << LLViewerPartSim::sParticleCount2 << LL_ENDL ;
+    // }
+    //
+    // if(size > (U32)LLViewerPartSim::sParticleCount2)
+    // {
+    //     LL_ERRS() << "current particle size: " << LLViewerPartSim::sParticleCount2 << " array size: " << size << LL_ENDL ; // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
+    // }
     if(LLViewerPartSim::sParticleCount2 != LLViewerPartSim::sParticleCount)
     {
-        LL_ERRS() << "sParticleCount: " << LLViewerPartSim::sParticleCount << " ; sParticleCount2: " << LLViewerPartSim::sParticleCount2 << LL_ENDL ;
+        static int fail_count{0};
+        if(fail_count > 10)
+        {
+            LL_ERRS() << "sParticleCount: " << LLViewerPartSim::sParticleCount << " ; sParticleCount2: " << LLViewerPartSim::sParticleCount2 << LL_ENDL ;
+        }
+        else
+        {
+            LL_WARNS() << "sParticleCount: " << LLViewerPartSim::sParticleCount << " ; sParticleCount2: " << LLViewerPartSim::sParticleCount2 << LL_ENDL ;
+        }
+        fail_count++;
     }
 
     if(size > (U32)LLViewerPartSim::sParticleCount2)
     {
-        LL_ERRS() << "current particle size: " << LLViewerPartSim::sParticleCount2 << " array size: " << size << LL_ENDL ; // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
+        static int size_mismatch_count{0};
+        if(size_mismatch_count > 10)
+        {
+            LL_ERRS() << "current particle size: " << LLViewerPartSim::sParticleCount2 << " array size: " << size << LL_ENDL ;
+        }
+        else
+        {
+            LL_WARNS() << "current particle size: " << LLViewerPartSim::sParticleCount2 << " array size: " << size << LL_ENDL ;
+        }
+        size_mismatch_count++;
     }
+    // </FS:Beq>
 }
 
 LLViewerPartSim::LLViewerPartSim()

From 887bed0dbe56c6844f2341773f754c38e25a8942 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Mon, 14 Oct 2024 23:23:31 +0100
Subject: [PATCH 15/21] FIRE-34351 - remove case-sensitivity from directory
 check

There's still scope for this to break if equivalent paths are given, such as a link in Linux or Mac. This fixes the typical case reported in the JIRA though.
---
 indra/llfilesystem/lldir.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llfilesystem/lldir.cpp b/indra/llfilesystem/lldir.cpp
index d57ef7c940..ba96038023 100644
--- a/indra/llfilesystem/lldir.cpp
+++ b/indra/llfilesystem/lldir.cpp
@@ -1109,7 +1109,7 @@ void LLDir::setSkinFolder(const std::string &skin_folder, const std::string& the
     addSearchSkinDir(mUserSkinDir);
 
     // <FS:Ansariel> If working directory is different from executable directory, add executable subdirs as searchable folders
-    if (mExecutableDir != mWorkingDir)
+    if (LLStringUtil::compareInsensitive( mExecutableDir, mWorkingDir) != 0)
     {
         addSearchSkinDir(add(mExecutableDir, "skins"));
         addSearchSkinDir(add(mExecutableDir, "skins", "default"));

From dfa893d0e6ba3710503c0847307b404a11b7da52 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 15 Oct 2024 01:39:03 +0200
Subject: [PATCH 16/21] FIRE-34351: Fix search order for skins properly: most
 generic first, most specific last

---
 indra/llfilesystem/lldir.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/indra/llfilesystem/lldir.cpp b/indra/llfilesystem/lldir.cpp
index ba96038023..04fff82742 100644
--- a/indra/llfilesystem/lldir.cpp
+++ b/indra/llfilesystem/lldir.cpp
@@ -1072,6 +1072,14 @@ void LLDir::setSkinFolder(const std::string &skin_folder, const std::string& the
     // time it's called, reset mSearchSkinDirs.
     mSearchSkinDirs.clear();
 
+    // <FS:Ansariel> If working directory is different from executable directory, add executable subdirs as searchable folders
+    if (LLStringUtil::compareInsensitive(mExecutableDir, mWorkingDir) != 0)
+    {
+        addSearchSkinDir(add(mExecutableDir, "skins"));
+        addSearchSkinDir(add(mExecutableDir, "skins", "default"));
+    }
+    // </FS:Ansariel>
+
     // base skin which is used as fallback for all skinned files
     // e.g. c:\program files\secondlife\skins\default
     mDefaultSkinDir = getSkinBaseDir();
@@ -1107,14 +1115,6 @@ void LLDir::setSkinFolder(const std::string &skin_folder, const std::string& the
     addSearchSkinDir(mUserDefaultSkinDir);
     // then user-defined skins.
     addSearchSkinDir(mUserSkinDir);
-
-    // <FS:Ansariel> If working directory is different from executable directory, add executable subdirs as searchable folders
-    if (LLStringUtil::compareInsensitive( mExecutableDir, mWorkingDir) != 0)
-    {
-        addSearchSkinDir(add(mExecutableDir, "skins"));
-        addSearchSkinDir(add(mExecutableDir, "skins", "default"));
-    }
-    // </FS:Ansariel>
 }
 
 void LLDir::addSearchSkinDir(const std::string& skindir)

From 9a5b46fe90f3d6a0e18a547e106b154a09985894 Mon Sep 17 00:00:00 2001
From: Beq <BeqJanus@vcs.firestormviewer.org>
Date: Tue, 15 Oct 2024 16:59:02 +0100
Subject: [PATCH 17/21] FIRE-33239 - when UI is disabled local selection
 particles are not removed.

---
 indra/newview/llhudeffecttrail.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/newview/llhudeffecttrail.cpp b/indra/newview/llhudeffecttrail.cpp
index 1d4c7d86af..e4caed0d25 100644
--- a/indra/newview/llhudeffecttrail.cpp
+++ b/indra/newview/llhudeffecttrail.cpp
@@ -205,6 +205,8 @@ void LLHUDEffectSpiral::triggerLocal()
             }
             else
             {
+                if (show_beam)
+                {
                 LLVector3 pos;
                 if (mSourceObject)
                 {
@@ -223,6 +225,7 @@ void LLHUDEffectSpiral::triggerLocal()
                 pss->setOwnerUUID(gAgent.getID());
                 LLViewerPartSim::getInstance()->addPartSource(pss);
                 mPartSourcep = pss;
+                }
             }
         }
     }

From e8c4d10e8dc2d0dbe0b5964df77e0933aafd21af Mon Sep 17 00:00:00 2001
From: Beq <BeqJanus@vcs.firestormviewer.org>
Date: Tue, 15 Oct 2024 17:06:01 +0100
Subject: [PATCH 18/21] Revert "FIRE-33239 - when UI is disabled local
 selection particles are not removed."

This reverts commit 9a5b46fe90f3d6a0e18a547e106b154a09985894.
---
 indra/newview/llhudeffecttrail.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/indra/newview/llhudeffecttrail.cpp b/indra/newview/llhudeffecttrail.cpp
index e4caed0d25..1d4c7d86af 100644
--- a/indra/newview/llhudeffecttrail.cpp
+++ b/indra/newview/llhudeffecttrail.cpp
@@ -205,8 +205,6 @@ void LLHUDEffectSpiral::triggerLocal()
             }
             else
             {
-                if (show_beam)
-                {
                 LLVector3 pos;
                 if (mSourceObject)
                 {
@@ -225,7 +223,6 @@ void LLHUDEffectSpiral::triggerLocal()
                 pss->setOwnerUUID(gAgent.getID());
                 LLViewerPartSim::getInstance()->addPartSource(pss);
                 mPartSourcep = pss;
-                }
             }
         }
     }

From 6020b58fc536dba8f3936e13b4e8511e6414ed43 Mon Sep 17 00:00:00 2001
From: Beq <BeqJanus@vcs.firestormviewer.org>
Date: Tue, 15 Oct 2024 23:32:23 +0100
Subject: [PATCH 19/21] FIRE-33239 - HUD Effect Particles do not die when UI is
 disabled.

---
 indra/newview/llhudobject.cpp     | 14 ++++++++++++--
 indra/newview/llviewerdisplay.cpp |  7 +++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llhudobject.cpp b/indra/newview/llhudobject.cpp
index e6fbfbfb38..1dd136f61f 100644
--- a/indra/newview/llhudobject.cpp
+++ b/indra/newview/llhudobject.cpp
@@ -309,10 +309,20 @@ void LLHUDObject::renderAllForTimer()
         {
             sHUDObjects.erase(cur_it);
         }
-        else if (hud_objp->isVisible())
+        // <FS:Beq> FIRE-33239 - particles do not sie when UI is disabled
+        // else if (hud_objp->isVisible())
+        // {
+        //     hud_objp->renderForTimer();
+        // }
+        else
         {
-            hud_objp->renderForTimer();
+            LLHUDEffect* effect = dynamic_cast<LLHUDEffect*>(hud_objp);
+            if (effect || hud_objp->isVisible())
+            {
+                hud_objp->renderForTimer();
+            }
         }
+        // </FS:Beq>
     }
 }
 
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 4128339639..406df69de8 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -1547,6 +1547,13 @@ void render_ui(F32 zoom_factor, int subfield)
             LLHUDObject::renderAll();
             render_ui_2d();
         }
+        // <FS:Beq> FIRE-33239 - particles do not sie when UI is disabled
+        if (!render_ui)
+        {
+            // Make sure particle effects disappear
+            LLHUDObject::renderAllForTimer();
+        }
+        // </FS:Beq>
 
         gViewerWindow->setup2DRender();
         gViewerWindow->updateDebugText();

From e7a25774c5c11d4765219efab5941ca48e5e213b Mon Sep 17 00:00:00 2001
From: Beq <BeqJanus@vcs.firestormviewer.org>
Date: Wed, 16 Oct 2024 01:30:41 +0100
Subject: [PATCH 20/21] FIRE-34600 - particle count mismatch revisited again

Remove the counting logic and simply manage the counts inline. This is safer and also addresses a potential edge case where the existing logic seems to fail during the movement of particles between groups.

Who knows it might even fix it!
---
 indra/newview/llviewerpartsim.cpp | 45 +++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp
index a9713258e5..dda38667ec 100644
--- a/indra/newview/llviewerpartsim.cpp
+++ b/indra/newview/llviewerpartsim.cpp
@@ -283,7 +283,10 @@ void LLViewerPartGroup::updateParticles(const F32 lastdt)
 
     LLViewerCamera* camera = LLViewerCamera::getInstance();
     LLViewerRegion *regionp = getRegion();
-    S32 end = (S32) mParticles.size();
+    // <FS:Beq> FIRE-34600 - Bugsplat AVX2 particle count mismatch    
+    // S32 end = (S32) mParticles.size();
+    bool changed = false;
+    // </FS:Beq>
     for (S32 i = 0 ; i < (S32)mParticles.size();)
     {
         LLVector3 a(0.f, 0.f, 0.f);
@@ -399,8 +402,15 @@ void LLViewerPartGroup::updateParticles(const F32 lastdt)
         // Kill dead particles (either flagged dead, or too old)
         if ((part->mLastUpdateTime > part->mMaxAge) || (LLViewerPart::LL_PART_DEAD_MASK == part->mFlags))
         {
-            vector_replace_with_last(mParticles, mParticles.begin() + i); // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
+            // <FS:Beq> FIRE-34600 - Bugsplat AVX2 particle count mismatch
+            // mParticles[i] = mParticles.back() ;
+            // mParticles.pop_back() ;
+            // delete part ;
+            vector_replace_with_last(mParticles, mParticles.begin() + i);
+            --LLViewerPartSim::sParticleCount; 
             delete part ;
+            changed = true; 
+            // </FS:Beq>
         }
         else
         {
@@ -408,8 +418,18 @@ void LLViewerPartGroup::updateParticles(const F32 lastdt)
             if (!posInGroup(part->mPosAgent, desired_size))
             {
                 // Transfer particles between groups
-                LLViewerPartSim::getInstance()->put(part) ;
-                vector_replace_with_last(mParticles, mParticles.begin() + i); // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
+                // <FS:Beq> FIRE-34600 - Bugsplat AVX2 particle count mismatch
+                // LLViewerPartSim::getInstance()->put(part) ;
+                // mParticles[i] = mParticles.back() ;
+                // mParticles.pop_back() ;                
+                vector_replace_with_last(mParticles, mParticles.begin() + i); 
+                LLViewerPartSim::getInstance()->put(part) ; 
+                // Note: put() uses addpart when succesful, this increase sParticleCount by 1
+                // even though it has stayed the same. If it is not succesful then we need to decrease by 1
+                // so a decrement here works for both cases.
+                --LLViewerPartSim::sParticleCount; 
+                changed = true;
+                // </FS:Beq>
             }
             else
             {
@@ -418,16 +438,25 @@ void LLViewerPartGroup::updateParticles(const F32 lastdt)
         }
     }
 
-    S32 removed = end - (S32)mParticles.size();
-    if (removed > 0)
+    // <FS:Beq> FIRE-34600 - Bugsplat AVX2 particle count mismatch
+    // S32 removed = end - (S32)mParticles.size();
+    // if (removed > 0)
+    // {
+    //     // we removed one or more particles, so flag this group for update
+    //     if (mVOPartGroupp.notNull())
+    //     {
+    //         gPipeline.markRebuild(mVOPartGroupp->mDrawable, LLDrawable::REBUILD_ALL);
+    //     }
+    //     LLViewerPartSim::decPartCount(removed);
+    // }    
+    if (changed)
     {
-        // we removed one or more particles, so flag this group for update
         if (mVOPartGroupp.notNull())
         {
             gPipeline.markRebuild(mVOPartGroupp->mDrawable, LLDrawable::REBUILD_ALL);
         }
-        LLViewerPartSim::sParticleCount -= removed; // <FS:Beq/> FIRE-34600 - bugsplat AVX2 particle count mismatch
     }
+    // </FS:Beq>
 
     // Kill the viewer object if this particle group is empty
     if (mParticles.empty())

From 2fa1f9302c9fa4946764c2718c90eac4f198fd55 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 16 Oct 2024 17:03:57 +0200
Subject: [PATCH 21/21] FIRE-34662 Fixing small typos in French translation

---
 indra/newview/skins/default/xui/fr/menu_outfit_tab.xml | 2 +-
 indra/newview/skins/default/xui/fr/strings.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml b/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml
index f3cc7fde96..d8886d9a69 100644
--- a/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml
@@ -7,5 +7,5 @@
 	<menu_item_call label="Modifier la tenue" name="edit"/>
 	<menu_item_call label="Renommer la tenue" name="rename"/>
 	<menu_item_call label="Enregister dans cette tenue" name="save"/>
-	<menu_item_call label="Suprimmer la tenue" name="delete"/>
+	<menu_item_call label="Supprimer la tenue" name="delete"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 7b4593e052..43fb7e9360 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -7000,7 +7000,7 @@ Votre position actuelle : [AVATAR_POS]
 		Agent inconnu
 	</string>
 	<string name="groupcountstring">
-		Vous faites partie de [COUNT] groups ([REMAINING] restant).
+		Vous faites partie de [COUNT] groupes ([REMAINING] restant).
 	</string>
 	<string name="groupcountunlimitedstring">
 		Vous faites partie de [COUNT] groupes.