diff --git a/doc/testplans/PRIM_MEDIA_FIRST_CLICK_INTERACT.md b/doc/testplans/PRIM_MEDIA_FIRST_CLICK_INTERACT.md
index 690146265c6..afb3d5b3377 100644
--- a/doc/testplans/PRIM_MEDIA_FIRST_CLICK_INTERACT.md
+++ b/doc/testplans/PRIM_MEDIA_FIRST_CLICK_INTERACT.md
@@ -103,13 +103,11 @@ Perform the testing procedure on both sets of cubes.
 
 Ensure that debug setting `MediaFirstClickInteract` is set to `4`
 
-This test case requires two pairs of cubes, and the second pair must be deeded or set to a group that your testing account is a member of, but does not have set as active at the beginning of the test. As long as the second set of cubes is set to a group that your primary test account is a member of, the avatar that owns them does not matter.
+This test case requires two cubes, and the second cube must be deeded or set to a group that your testing account is a member of. As long as the second set of cubes is set to a group that your test account is a member of, the avatar that owns them does not matter.
 
-1. Perform the testing procedure on both sets of cubes.
-2. Activate the group that the second set of cubes is set / deeded to
-3. Perform the testing procedure on both sets of cubes once more.
+Perform the testing procedure on both sets of cubes.
 
-**Expected observations:** Both cubes owned by your primary testing account will not react to mouse cursor hover events and clicks without needing a focus click. Cube A set to group will react to mouse cursor hover events and clicks without needing a focus click, but Cube B will not.
+**Expected observations:** The cube owned by your primary account will not react to mouse cursor hover events and clicks without needing a focus click. The cube set to group will react to mouse cursor hover events and clicks without needing a focus click.
 
 ### Case 5 (MEDIA_FIRST_CLICK_FRIEND)
 
@@ -144,16 +142,16 @@ Note: This requires the avatar that is performing the tests to physically be in
 
 ### Case 7 (MEDIA_FIRST_CLICK_ANY) (optional)
 
-Ensure that debug setting `MediaFirstClickInteract` is set to `31`
+Ensure that debug setting `MediaFirstClickInteract` is set to `32767`
 
 Repeat test cases 1-6.
 
 1. Test case 1 should fail
 2. Test cases 2-6 should pass
 
-### Case 8 (MEDIA_FIRST_CLICK_ALL) (optional)
+### Case 8 (MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG) (optional)
 
-Ensure that debug setting `MediaFirstClickInteract` is set to `1073741824`
+Ensure that debug setting `MediaFirstClickInteract` is set to `65535`
 
 Repeat test cases 1-6, there is no pass/fail for this run.
 
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 1cac6e97090..97190cde4c1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16237,7 +16237,7 @@
     <key>MediaFirstClickInteract</key>
     <map>
       <key>Comment</key>
-      <string>This setting controls which media (once loaded) does not require a first click to focus before interaction can begin. This allows clicks to be passed directly to media bypassing the focus click requirement. This setting is a bitfield, precomputed values are as follows: Disabled=0; Worn HUDs only=1; Owned objects=3; Friend objects=7; Group objects=15; Landowner objects=31; Any object=31; All MOAP=1073741824. For complete details see lltoolpie.h enum MediaFirstClickTypes.</string>
+      <string>This setting controls which media (once loaded) does not require a first click to focus before interaction can begin. This allows clicks to be passed directly to media bypassing the focus click requirement. This setting is a bitfield, precomputed values are as follows: Disabled=0; Worn HUDs only=1; Owned objects=2; Friend objects=4; Group objects=8; Landowner objects=16; Any object=32767; All MOAP=32768. For complete details see lltoolpie.h enum MediaFirstClickTypes.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h
index d9daad95157..ec54e0207d8 100644
--- a/indra/newview/lltoolpie.h
+++ b/indra/newview/lltoolpie.h
@@ -99,10 +99,10 @@ class LLToolPie : public LLTool, public LLSingleton<LLToolPie>
         MEDIA_FIRST_CLICK_LAND       = 1 << 4,    // 0b00010000 (16)
 
         // Covers any object with PRIM_MEDIA_FIRST_CLICK_INTERACT (combines all previous flags)
-        MEDIA_FIRST_CLICK_ANY        = ~(3<<30),  // 0b00111111111111111111111111111111
+        MEDIA_FIRST_CLICK_ANY        = (1 << 15) - 1, // 0b0111111111111111 (32767)
 
         // Covers all media regardless of other rules or PRIM_MEDIA_FIRST_CLICK_INTERACT
-        MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG = 1 << 30    // 0b01000000000000000000000000000000 (1073741824)
+        MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG = 1 << 15  // 0b10000000000000000 (32768)
     };
     bool shouldAllowFirstMediaInteraction(const LLPickInfo& info, bool moap_flag);
     bool handleMediaClick(const LLPickInfo& info);
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index de6132aec63..52413abe74a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -422,11 +422,11 @@
         <item
             label="Anyone's objects"
             name="media_first_interact_any"
-            value="1073741823"/>
+            value="32767"/>
         <item
             label="All MOAP"
             name="media_first_click_all"
-            value="2147483647"/>
+            value="65535"/>
     </combo_box>
    <check_box
     name="media_show_on_others_btn"