diff --git a/indra/newview/aldiscordmanager.cpp b/indra/newview/aldiscordmanager.cpp index 3d953df857c8fad310504777520fcce96aeb6c7c..1cb2b871c1ae6ac3a271ad9aef42b355f76a0294 100644 --- a/indra/newview/aldiscordmanager.cpp +++ b/indra/newview/aldiscordmanager.cpp @@ -185,9 +185,9 @@ void ALDiscordManager::updateActivity() activity.SetType(discord::ActivityType::Playing); static LLCachedControl<bool> discord_shared_region(gSavedPerAccountSettings, "ALDiscordShareLocationRegion", true); - static LLCachedControl<U32> discord_shared_region_maturity(gSavedPerAccountSettings, "ALDiscordShareRegionMaxMaturity", true); + static LLCachedControl<U32> discord_shared_region_maturity(gSavedPerAccountSettings, "ALDiscordShareRegionMaxMaturity", 13); std::string region_name; - if (RlvActions::canShowLocation() && discord_shared_region && region->getSimAccess() >= discord_shared_region_maturity) + if (RlvActions::canShowLocation() && discord_shared_region && region->getSimAccess() <= discord_shared_region_maturity) { const LLVector3& pos = gAgent.getPositionAgent(); region_name = fmt::format(FMT_COMPILE("{} ({:.0f}, {:.0f}, {:.0f})"), region->getName(), pos.mV[VX], pos.mV[VY], pos.mV[VZ]); diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index c1f736dc7aadb629bd02d13e00f934b1c5aef361..3373a5c80af858adfb8ff499bd402c35b668fb9b 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -123,7 +123,30 @@ follows="left|top" left="50" name="Discord_Integration_Show_Region" - width="350" /> + width="350" /> + <combo_box + control_name="ALDiscordShareRegionMaxMaturity" + follows="left|top" + height="23" + layout="topleft" + left_delta="200" + name="maturity_desired_combobox" + width="200"> + <combo_box.item + label="General, Moderate, Adult" + name="Desired_Adult" + value="42" /> + <combo_box.item + label="General and Moderate" + name="Desired_Mature" + value="21" /> + <combo_box.item + label="General" + name="Desired_PG" + value="13" /> + <combo_box.commit_callback + function="Pref.MaturitySettings"/> + </combo_box> <text type="string" length="1"