From eb3e5179c4c3213bf4af840355b5470963537567 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Tue, 16 Apr 2013 17:44:10 +0200 Subject: [PATCH] - fixed : "Share" on any context menu opens the inventory floater even when @showinv=n restricted -> showing a sidepanel panel will call the floater's validator if it isn't currently open --HG-- branch : RLVa --- indra/newview/llfloatersidepanelcontainer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/newview/llfloatersidepanelcontainer.cpp b/indra/newview/llfloatersidepanelcontainer.cpp index aa4280d911..534a53af5f 100644 --- a/indra/newview/llfloatersidepanelcontainer.cpp +++ b/indra/newview/llfloatersidepanelcontainer.cpp @@ -127,8 +127,8 @@ void LLFloaterSidePanelContainer::showPanel(const std::string& floater_name, con { LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance(floater_name); // if (floaterp) -// [RLVa:KB] - Checked: 2012-02-07 (RLVa-1.4.5) | Added: RLVa-1.4.5 - if ( (floaterp) && (mValidateSignal(floater_name, sMainPanelName, key)) ) +// [RLVa:KB] - Checked: 2013-04-16 (RLVa-1.4.8) + if ( (floaterp) && ((floaterp->getVisible()) || (LLFloaterReg::canShowInstance(floater_name, key))) && (canShowPanel(floater_name, key)) ) // [/RLVa:KB] { floaterp->openChildPanel(sMainPanelName, key); @@ -139,8 +139,8 @@ void LLFloaterSidePanelContainer::showPanel(const std::string& floater_name, con { LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance(floater_name); // if (floaterp) -// [RLVa:KB] - Checked: 2012-02-07 (RLVa-1.4.5) | Added: RLVa-1.4.5 - if ( (floaterp) && (mValidateSignal(floater_name, panel_name, key)) ) +// [RLVa:KB] - Checked: 2013-04-16 (RLVa-1.4.8) + if ( (floaterp) && ((floaterp->getVisible()) || (LLFloaterReg::canShowInstance(floater_name, key))) && (canShowPanel(floater_name, panel_name, key)) ) // [/RLVa:KB] { floaterp->openChildPanel(panel_name, key);