livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- 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
master
Kitty Barnett 2013-04-16 17:44:10 +02:00
parent 37f18aaa6e
commit eb3e5179c4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llfloatersidepanelcontainer.cpp
View File

@ -127,8 +127,8 @@ void LLFloaterSidePanelContainer::showPanel(const std::string& floater_name, con
{
LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>(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<LLFloaterSidePanelContainer>(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);