Merge pull request #99 from XenHat/xenhat/fix/discord

Fix Discord Rich Presence Max Maturity

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]);

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"