From 36e0b1a4e153e78012c8e010857ecdce1db468e5 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Mon, 29 Nov 2021 09:56:58 +0100
Subject: [PATCH] RLVa fix: Prevent "Show Original" from circumventing @showinv
 restriction

---
 indra/newview/llinventoryfunctions.cpp                    | 8 ++++++++
 .../skins/default/xui/en/menu_wearable_list_item.xml      | 3 +++
 indra/newview/skins/default/xui/en/menu_wearing_tab.xml   | 3 +++
 3 files changed, 14 insertions(+)

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index bd48bbfdc0..9468581c70 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -89,6 +89,7 @@
 #include "llwearablelist.h"
 // [RLVa:KB] - Checked: 2011-05-22 (RLVa-1.3.1a)
 #include "rlvactions.h"
+#include "rlvhandler.h"
 #include "rlvlocks.h"
 // [/RLVa:KB]
 
@@ -885,6 +886,13 @@ void show_item_profile(const LLUUID& item_uuid)
 
 void show_item_original(const LLUUID& item_uuid)
 {
+    // <FS:Ansariel> Don't show if @showinv=n
+    if (rlv_handler_t::isEnabled() && gRlvHandler.hasBehaviour(RLV_BHVR_SHOWINV))
+    {
+        return;
+    }
+    // </FS:Ansariel>
+
     LLFloater* floater_inventory = LLFloaterReg::getInstance("inventory");
     if (!floater_inventory)
     {
diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
index 6e3ae0de0c..51ba1e0265 100644
--- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
@@ -87,6 +87,9 @@
      name="show_original">
         <on_click
          function="Wearable.ShowOriginal" />
+        <on_enable
+         function="RLV.EnableIfNot"
+         parameter="showinv"/>
     </menu_item_call>
     <menu_item_call
      label="Create New"
diff --git a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
index a261665051..65fcec1dab 100644
--- a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
@@ -47,6 +47,9 @@
      name="show_original">
         <on_click
          function="Wearing.ShowOriginal" />
+        <on_enable
+         function="RLV.EnableIfNot"
+         parameter="showinv"/>
     </menu_item_call>
     <menu_item_call
      label="Edit Outfit"