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

Include MOAP interaction option for anyone's objects

master
Ansariel 2025-06-29 20:11:38 +02:00
parent 82f086813d
commit 41217b598f
4 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
indra/newview/llfloaterpreference.cpp
View File

@ -6289,6 +6289,8 @@ FSPanelPreferenceSounds::FSPanelPreferenceSounds() :
LLPanelPreference(),
mOutputDevicePanel(nullptr),
mOutputDeviceComboBox(nullptr),
mMoapInteractionAll(nullptr),
mMoapInteractionAny(nullptr),
mMoapInteractionHud(nullptr),
mMoapInteractionOwnObjects(nullptr),
mMoapInteractionGroupObjects(nullptr),
@ -6311,6 +6313,7 @@ bool FSPanelPreferenceSounds::postBuild()
mOutputDeviceComboBox = findChild<LLComboBox>("sound_output_device");
mMoapInteractionAll = getChild<LLCheckBoxCtrl>("media_first_click_all");
mMoapInteractionAny = getChild<LLCheckBoxCtrl>("media_first_click_any");
mMoapInteractionHud = getChild<LLCheckBoxCtrl>("media_first_click_hud");
mMoapInteractionOwnObjects = getChild<LLCheckBoxCtrl>("media_first_click_own");
mMoapInteractionGroupObjects = getChild<LLCheckBoxCtrl>("media_first_click_group");
@ -6335,6 +6338,7 @@ bool FSPanelPreferenceSounds::postBuild()
#endif
mMoapInteractionAll->setCommitCallback(boost::bind(&FSPanelPreferenceSounds::updateMoapInteractionSetting, this));
mMoapInteractionAny->setCommitCallback(boost::bind(&FSPanelPreferenceSounds::updateMoapInteractionSetting, this));
mMoapInteractionHud->setCommitCallback(boost::bind(&FSPanelPreferenceSounds::updateMoapInteractionSetting, this));
mMoapInteractionOwnObjects->setCommitCallback(boost::bind(&FSPanelPreferenceSounds::updateMoapInteractionSetting, this));
mMoapInteractionGroupObjects->setCommitCallback(boost::bind(&FSPanelPreferenceSounds::updateMoapInteractionSetting, this));
@ -6403,21 +6407,24 @@ void FSPanelPreferenceSounds::onOutputDeviceListChanged(LLAudioEngine::output_de
void FSPanelPreferenceSounds::onMoapInteractionChanged()
{
auto bitvalue = gSavedSettings.getS32("MediaFirstClickInteract");
const auto bitvalue = gSavedSettings.getS32("MediaFirstClickInteract");
mMoapInteractionAll->set(bitvalue & LLToolPie::MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG);
mMoapInteractionAny->set((bitvalue & LLToolPie::MEDIA_FIRST_CLICK_ANY) == LLToolPie::MEDIA_FIRST_CLICK_ANY);
mMoapInteractionHud->set(bitvalue & LLToolPie::MEDIA_FIRST_CLICK_HUD);
mMoapInteractionOwnObjects->set(bitvalue & LLToolPie::MEDIA_FIRST_CLICK_OWN);
mMoapInteractionGroupObjects->set(bitvalue & LLToolPie::MEDIA_FIRST_CLICK_GROUP);
mMoapInteractionFriendObjects->set(bitvalue & LLToolPie::MEDIA_FIRST_CLICK_FRIEND);
mMoapInteractionLandownerObjects->set(bitvalue & LLToolPie::MEDIA_FIRST_CLICK_LAND);
bool is_all_selected = bitvalue & LLToolPie::MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG;
mMoapInteractionHud->setEnabled(!is_all_selected);
mMoapInteractionOwnObjects->setEnabled(!is_all_selected);
mMoapInteractionGroupObjects->setEnabled(!is_all_selected);
mMoapInteractionFriendObjects->setEnabled(!is_all_selected);
mMoapInteractionLandownerObjects->setEnabled(!is_all_selected);
const bool is_all_selected = (bitvalue & LLToolPie::MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG) == LLToolPie::MEDIA_FIRST_CLICK_BYPASS_MOAP_FLAG;
const bool is_any_selected = (bitvalue & LLToolPie::MEDIA_FIRST_CLICK_ANY) == LLToolPie::MEDIA_FIRST_CLICK_ANY;
mMoapInteractionAny->setEnabled(!is_all_selected);
mMoapInteractionHud->setEnabled(!is_all_selected && !is_any_selected);
mMoapInteractionOwnObjects->setEnabled(!is_all_selected && !is_any_selected);
mMoapInteractionGroupObjects->setEnabled(!is_all_selected && !is_any_selected);
mMoapInteractionFriendObjects->setEnabled(!is_all_selected && !is_any_selected);
mMoapInteractionLandownerObjects->setEnabled(!is_all_selected && !is_any_selected);
}
void FSPanelPreferenceSounds::updateMoapInteractionSetting()
@ -6426,13 +6433,17 @@ void FSPanelPreferenceSounds::updateMoapInteractionSetting()
{
gSavedSettings.setS32("MediaFirstClickInteract", std::numeric_limits<S32>::max());
}
else if (mMoapInteractionAny->get())
{
gSavedSettings.setS32("MediaFirstClickInteract", LLToolPie::MEDIA_FIRST_CLICK_ANY);
}
else
{
S32 value = (mMoapInteractionHud->get() ? LLToolPie::MEDIA_FIRST_CLICK_HUD : 0) |
(mMoapInteractionOwnObjects->get() ? LLToolPie::MEDIA_FIRST_CLICK_OWN : 0) |
(mMoapInteractionGroupObjects->get() ? LLToolPie::MEDIA_FIRST_CLICK_GROUP : 0) |
(mMoapInteractionFriendObjects->get() ? LLToolPie::MEDIA_FIRST_CLICK_FRIEND : 0) |
(mMoapInteractionLandownerObjects->get() ? LLToolPie::MEDIA_FIRST_CLICK_LAND : 0);
const S32 value = (mMoapInteractionHud->get() ? LLToolPie::MEDIA_FIRST_CLICK_HUD : 0) |
(mMoapInteractionOwnObjects->get() ? LLToolPie::MEDIA_FIRST_CLICK_OWN : 0) |
(mMoapInteractionGroupObjects->get() ? LLToolPie::MEDIA_FIRST_CLICK_GROUP : 0) |
(mMoapInteractionFriendObjects->get() ? LLToolPie::MEDIA_FIRST_CLICK_FRIEND : 0) |
(mMoapInteractionLandownerObjects->get() ? LLToolPie::MEDIA_FIRST_CLICK_LAND : 0);
gSavedSettings.setS32("MediaFirstClickInteract", value);
}

1
indra/newview/llfloaterpreference.h
View File

@ -642,6 +642,7 @@ private:
LLComboBox* mOutputDeviceComboBox;
LLCheckBoxCtrl* mMoapInteractionAll;
LLCheckBoxCtrl* mMoapInteractionAny;
LLCheckBoxCtrl* mMoapInteractionHud;
LLCheckBoxCtrl* mMoapInteractionOwnObjects;
LLCheckBoxCtrl* mMoapInteractionGroupObjects;

1
indra/newview/skins/default/xui/de/panel_preferences_sound.xml
View File

@ -88,6 +88,7 @@
Medien Erst-Interaktion:
</text>
<check_box name="media_first_click_all" label="Alle Medien auf Objekten (MOAP)"/>
<check_box name="media_first_click_any" label="Objekte von Jedermann"/>
<check_box name="media_first_click_hud" label="Nur getragene HUDs"/>
<check_box name="media_first_click_own" label="Eigene Objekte"/>
<check_box name="media_first_click_group" label="Gruppen-Objekte"/>

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

@ -670,6 +670,14 @@
label="All MOAP"
top_pad="3"
left="25"/>
<check_box
name="media_first_click_any"
follows="left|top"
layout="topleft"
height="16"
label="Anyone's objects"
top_pad="3"
left="25"/>
<check_box
name="media_first_click_hud"
follows="left|top"