From 7c812767dd6539fdb0a00201a911de02d591ed76 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Mon, 16 Sep 2024 13:54:45 +0200
Subject: [PATCH 1/2] FIRE-34503: Fix crash when running RLVa
 @setcam_eyeoffsetscale command

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

diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index 5bc0aae4b6..c02ffabfc8 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -207,7 +207,7 @@ RlvBehaviourDictionary::RlvBehaviourDictionary()
     addEntry(new RlvBehaviourGenericToggleProcessor<RLV_BHVR_SETCAM_EYEOFFSET, RLV_OPTION_MODIFIER, RlvBehaviourCamEyeFocusOffsetHandler>("setcam_eyeoffset"));
     addModifier(RLV_BHVR_SETCAM_EYEOFFSET, RLV_MODIFIER_SETCAM_EYEOFFSET, new RlvBehaviourModifierHandler<RLV_MODIFIER_SETCAM_EYEOFFSET>("Camera - Eye Offset", LLVector3::zero, true, nullptr));
     addEntry(new RlvBehaviourGenericToggleProcessor<RLV_BHVR_SETCAM_EYEOFFSETSCALE, RLV_OPTION_MODIFIER, RlvBehaviourCamEyeFocusOffsetHandler>("setcam_eyeoffsetscale"));
-    addModifier(RLV_BHVR_SETCAM_EYEOFFSETSCALE, RLV_MODIFIER_SETCAM_EYEOFFSETSCALE, new RlvBehaviourModifierHandler<RLV_MODIFIER_SETCAM_EYEOFFSETSCALE>("Camera - Eye Offset Scale", 0, true, nullptr));
+    addModifier(RLV_BHVR_SETCAM_EYEOFFSETSCALE, RLV_MODIFIER_SETCAM_EYEOFFSETSCALE, new RlvBehaviourModifierHandler<RLV_MODIFIER_SETCAM_EYEOFFSETSCALE>("Camera - Eye Offset Scale", 0.0f, true, nullptr));
     addEntry(new RlvBehaviourGenericToggleProcessor<RLV_BHVR_SETCAM_FOCUSOFFSET, RLV_OPTION_MODIFIER, RlvBehaviourCamEyeFocusOffsetHandler>("setcam_focusoffset"));
     addModifier(RLV_BHVR_SETCAM_FOCUSOFFSET, RLV_MODIFIER_SETCAM_FOCUSOFFSET, new RlvBehaviourModifierHandler<RLV_MODIFIER_SETCAM_FOCUSOFFSET>("Camera - Focus Offset", LLVector3d::zero, true, nullptr));
     addEntry(new RlvBehaviourProcessor<RLV_BHVR_SETCAM_FOVMIN, RlvBehaviourSetCamFovHandler>("setcam_fovmin"));

From cfe96f8c3fda839188943fe4cfb97f1d0c5afc2f Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Mon, 16 Sep 2024 14:04:32 +0200
Subject: [PATCH 2/2] FIRE-34396: Add 4K UHD option to window size floater

---
 indra/newview/skins/default/xui/de/floater_window_size.xml | 1 +
 indra/newview/skins/default/xui/en/floater_window_size.xml | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/indra/newview/skins/default/xui/de/floater_window_size.xml b/indra/newview/skins/default/xui/de/floater_window_size.xml
index b1e94127a8..dfc7ba9aa1 100644
--- a/indra/newview/skins/default/xui/de/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/de/floater_window_size.xml
@@ -20,6 +20,7 @@
 		<combo_box.item label="1920 x 1080 (16:9 FHD)" name="item12"/>
 		<combo_box.item label="1920 x 1200 (16:10 WUXGA)" name="item13"/>
 		<combo_box.item label="2560 x 1440 (16:9 QHD)" name="item14"/>
+		<combo_box.item label="3840 x 2160 (16:9 4K UHD)" name="item15"/>
 	</combo_box>
 	<button label="Festlegen" name="set_btn"/>
 	<button label="Abbrechen" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/en/floater_window_size.xml b/indra/newview/skins/default/xui/en/floater_window_size.xml
index 26a291e2be..20a23fe052 100644
--- a/indra/newview/skins/default/xui/en/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/en/floater_window_size.xml
@@ -80,6 +80,10 @@
        label="2560 x 1440 (16:9 QHD)"
        name="item14"
        value="2560 x 1440" />
+      <combo_box.item
+       label="3840 x 2160 (16:9 4K UHD)"
+       name="item15"
+       value="3840 x 2160" />
     </combo_box>
     <button
      follows="right|bottom"