#5055 don't show moderate menu if the user is not parcel owner within a parcel with restricted voice

1 files changed, 15 insertions, 3 deletions

diff --git a/indra/newview/llnearbyvoicemoderation.cpp b/indra/newview/llnearbyvoicemoderation.cpp
index d3e540e838..668365d266 100644
--- a/indra/newview/llnearbyvoicemoderation.cpp
+++ b/indra/newview/llnearbyvoicemoderation.cpp
@@ -194,7 +194,19 @@ bool LLNearbyVoiceModeration::showMutedNotification(bool is_muted)
 
 bool LLNearbyVoiceModeration::isNearbyChatModerator()
 {
-    return gAgent.getRegion() && gAgent.getRegion()->isRegionWebRTCEnabled() &&
-           (gAgent.canManageEstate() || LLViewerParcelMgr::getInstance()->allowVoiceModeration());
-}
+    // Region doesn't support WebRTC voice
+    if (!gAgent.getRegion() || !gAgent.getRegion()->isRegionWebRTCEnabled())
+    {
+        return false;
+    }
 
+    if (LLViewerParcelMgr::getInstance()->isVoiceRestricted())
+    {
+        // Only the parcel owner should have access to moderate parcel voice space
+        return LLViewerParcelMgr::getInstance()->allowVoiceModeration();
+    }
+    else
+    {
+        return gAgent.canManageEstate();
+    }
+}