From ebe0e396b13d71227bbd42b3ee55f23936303aa1 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Mon, 4 Aug 2025 09:53:30 +0100
Subject: [PATCH] FIRE-35761 - Primfeed/Flickr: Saved Setting breaks photo size
 selection

These settings when tied into the XML cause the resolution selection to break. Because users now have  saved setting once it is changed it cannot be fixed, SO I think the only solution is to remove the setting binding to the panel. Better solutions appreciated.
---
 .../app_settings/settings_per_account.xml     | 22 -------------------
 .../default/xui/en/panel_flickr_photo.xml     |  1 -
 .../default/xui/en/panel_primfeed_photo.xml   |  1 -
 3 files changed, 24 deletions(-)

diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 1b027b4d75..95e203bb67 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -1457,28 +1457,6 @@
         <key>Value</key>
             <integer>1</integer>
         </map>
-     <key>FSPrimfeedPhotoResolution</key>
-        <map>
-        <key>Comment</key>
-            <string>Last used resolution for Primfeed photos.</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>LLSD</string>
-        <key>Value</key>
-            <array/>
-        </map>
-     <key>FlickrPhotoResolution</key>
-        <map>
-        <key>Comment</key>
-            <string>Last used resolution for Primfeed photos.</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>LLSD</string>
-        <key>Value</key>
-            <array/>
-        </map>
      <key>FlickrPhotoRating</key>
         <map>
         <key>Comment</key>
diff --git a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
index 3fa0a8bee0..f305fc5e37 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -5,7 +5,6 @@
       layout="topleft"
       name="panel_flickr_photo">
             <combo_box
-             control_name="FlickrPhotoResolution"
              follows="left|top"
 			 layout="topleft"
              top="5"
diff --git a/indra/newview/skins/default/xui/en/panel_primfeed_photo.xml b/indra/newview/skins/default/xui/en/panel_primfeed_photo.xml
index b5caf4e90a..82bd39d6aa 100644
--- a/indra/newview/skins/default/xui/en/panel_primfeed_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_primfeed_photo.xml
@@ -6,7 +6,6 @@
     layout="topleft"
     name="panel_primfeed_photo">
   <combo_box
-      control_name="FSPrimfeedPhotoResolution"
       follows="left|top"
       layout="topleft"
       top="5"