livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4304 from WolfGangS/media-first-click-fixes 

Media first click fixes for #4177
master
Jonathan "Geenz" Goodman 2025-06-27 19:08:56 -04:00 committed by GitHub
parent 45ca7fc73b 480eae537e
commit 2fdca60e61
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/lltoolpie.cpp
View File

@ -1520,14 +1520,8 @@ bool LLToolPie::shouldAllowFirstMediaInteraction(const LLPickInfo& pick, bool mo
LL_DEBUGS_ONCE() << "FirstClickPref == MEDIA_FIRST_CLICK_NONE" << LL_ENDL;
return false;
}
// All objects (overriding PRIM_MEDIA_FIRST_CLICK_INTERACT)
if(FirstClickPref == MEDIA_FIRST_CLICK_ALL)
{
LL_DEBUGS_ONCE() << "FirstClickPref & MEDIA_FIRST_CLICK_ALL" << LL_ENDL;
return true;
}
// Every check beyond this point requires PRIM_MEDIA_FIRST_CLICK_INTERACT to be TRUE
if(!moap_flag)
if(!moap_flag && !(FirstClickPref & MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG))
{
LL_DEBUGS_ONCE() << "PRIM_MEDIA_FIRST_CLICK_INTERACT not set" << LL_ENDL;
return false;

10
indra/newview/lltoolpie.h
View File

@ -98,15 +98,11 @@ private:
MEDIA_FIRST_CLICK_FRIEND = 1 << 3, // 0b00001000 (8)
MEDIA_FIRST_CLICK_LAND = 1 << 4, // 0b00010000 (16)
// Covers any object with PRIM_MEDIA_FIRST_CLICK_INTERACT (combines all other flags)
MEDIA_FIRST_CLICK_ANY = MEDIA_FIRST_CLICK_HUD &
MEDIA_FIRST_CLICK_OWN &
MEDIA_FIRST_CLICK_GROUP &
MEDIA_FIRST_CLICK_FRIEND &
MEDIA_FIRST_CLICK_LAND,
// Covers any object with PRIM_MEDIA_FIRST_CLICK_INTERACT (combines all previous flags)
MEDIA_FIRST_CLICK_ANY = ~(3<<30), // 0b00111111111111111111111111111111
// Covers all media regardless of other rules or PRIM_MEDIA_FIRST_CLICK_INTERACT
MEDIA_FIRST_CLICK_ALL = 1 << 30 // 0b01000000000000000000000000000000 (1073741824)
MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG = 1 << 30 // 0b01000000000000000000000000000000 (1073741824)
};
bool shouldAllowFirstMediaInteraction(const LLPickInfo& info, bool moap_flag);
bool handleMediaClick(const LLPickInfo& info);

14
indra/newview/skins/default/xui/en/panel_preferences_sound.xml
View File

@ -408,25 +408,25 @@
name="media_first_click_own"
value="3"/>
<item
label="Friend objects"
name="media_first_click_group"
value="7"/>
label="Friends' objects"
name="media_first_click_friend"
value="11"/>
<item
label="Group objects"
name="media_first_click_friend"
name="media_first_click_group"
value="15"/>
<item
label="Landowner objects"
name="media_first_click_land"
value="31"/>
<item
label="Any object"
label="Anyone's objects"
name="media_first_interact_any"
value="31"/>
value="1073741823"/>
<item
label="All MOAP"
name="media_first_click_all"
value="1073741824"/>
value="2147483647"/>
</combo_box>
<check_box
name="media_show_on_others_btn"