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

FIRE-15346: Mini in standalone radar is still shown under RLVa showminimap restriction

Ansariel 2015-01-10 11:41:03 +01:00
parent a9c56da233
commit 3da1a2f3ed
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/rlvui.cpp
View File

@ -370,6 +370,18 @@ void RlvUIEnabler::onToggleShowMinimap()
if ( (!fEnable) && (pNetMapPanel->getVisible()) )
pNetMapPanel->setVisible(false);
}
// Break/reestablish the visibility connection for the radar panel embedded minimap instance
LLFloater* pRadarFloater = LLFloaterReg::getInstance("fs_radar");
LLPanel* pRadarNetMapPanel = (pRadarFloater) ? pRadarFloater->getChild<LLPanel>("minimaplayout", TRUE) : NULL; //AO: firestorm specific
RLV_ASSERT( (pRadarFloater) && (pRadarNetMapPanel) );
if (pRadarNetMapPanel)
{
pRadarNetMapPanel->setMakeVisibleControlVariable( (fEnable) ? gSavedSettings.getControl("ShowRadarMinimap").get() : NULL);
// Reestablishing the visiblity connection will show the panel if needed so we only need to take care of hiding it when needed
if ( (!fEnable) && (pRadarNetMapPanel->getVisible()) )
pRadarNetMapPanel->setVisible(false);
}
}
// Checked: 2010-12-08 (RLVa-1.4.0a) | Modified: RLVa-1.2.2c