Skip to content

Fix bit logic mistake in PRIM_MEDIA_FIRST_CLICK_INTERACT work #4311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 2, 2025
Merged

Fix bit logic mistake in PRIM_MEDIA_FIRST_CLICK_INTERACT work #4311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e16044f
Fix bit logic mistake in PRIM_MEDIA_FIRST_CLICK_INTERACT work, was re…
WolfGangS Jun 28, 2025
c4bcda2
Swap Friend and Group Bit values, to bring the enum inline with the s…
WolfGangS Jun 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion indra/newview/lltoolpie.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1527,7 +1527,7 @@ bool LLToolPie::shouldAllowFirstMediaInteraction(const LLPickInfo& pick, bool mo
return false;
}
// Any object with PRIM_MEDIA_FIRST_CLICK_INTERACT set to TRUE
if(FirstClickPref & MEDIA_FIRST_CLICK_ANY)
if((FirstClickPref & MEDIA_FIRST_CLICK_ANY) == MEDIA_FIRST_CLICK_ANY)
{
LL_DEBUGS_ONCE() << "FirstClickPref & MEDIA_FIRST_CLICK_ANY" << LL_ENDL;
return true;
Expand Down
4 changes: 2 additions & 2 deletions indra/newview/lltoolpie.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ class LLToolPie : public LLTool, public LLSingleton<LLToolPie>
MEDIA_FIRST_CLICK_NONE = 0, // Special case: Feature is disabled
MEDIA_FIRST_CLICK_HUD = 1 << 0, // 0b00000001 (1)
MEDIA_FIRST_CLICK_OWN = 1 << 1, // 0b00000010 (2)
MEDIA_FIRST_CLICK_GROUP = 1 << 2, // 0b00000100 (4)
MEDIA_FIRST_CLICK_FRIEND = 1 << 3, // 0b00001000 (8)
MEDIA_FIRST_CLICK_FRIEND = 1 << 2, // 0b00000100 (4)
MEDIA_FIRST_CLICK_GROUP = 1 << 3, // 0b00001000 (8)
MEDIA_FIRST_CLICK_LAND = 1 << 4, // 0b00010000 (16)

// Covers any object with PRIM_MEDIA_FIRST_CLICK_INTERACT (combines all previous flags)
Expand Down
2 changes: 1 addition & 1 deletion indra/newview/skins/default/xui/en/panel_preferences_sound.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@
<item
label="Friends' objects"
name="media_first_click_friend"
value="11"/>
value="7"/>
<item
label="Group objects"
name="media_first_click_group"
Expand Down
Loading