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

- internal : adjusted RlvUIEnabler::onToggleShowMinimap() for Firestorm

Kitty Barnett 2011-06-11 11:58:56 +02:00
parent 2ff328e673
commit 6bfecaea82
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/rlvui.cpp
View File

@ -360,11 +360,11 @@ void RlvUIEnabler::onToggleShowMinimap()
// Break/reestablish the visibility connection for the nearby people panel embedded minimap instance
LLPanel* pPeoplePanel = LLSideTray::getInstance()->getPanel("panel_people");
LLPanel* pNetMapPanel = (pPeoplePanel) ? pPeoplePanel->getChild<LLPanel>("Net Map Panel", 1) : NULL;
LLPanel* pNetMapPanel = (pPeoplePanel) ? pPeoplePanel->getChild<LLPanel>("minimaplayout", TRUE) : NULL;
RLV_ASSERT( (pPeoplePanel) && (pNetMapPanel) );
if (pNetMapPanel)
{
pNetMapPanel->setMakeVisibleControlVariable( (fEnable) ? gSavedSettings.getControl("NearbyListShowMap").get() : NULL);
pNetMapPanel->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) && (pNetMapPanel->getVisible()) )
pNetMapPanel->setVisible(false);

7
indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
View File

@ -7,11 +7,14 @@
<menu_item_check
label="Show Minimap above Radar"
name="ShowRadarMinimap">
<menu_item_check.on_check
control="ShowRadarMinimap" />
<menu_item_check.on_check
control="ShowRadarMinimap" />
<menu_item_check.on_click
function="ToggleControl"
parameter="ShowRadarMinimap" />
<menu_item_check.on_enable
function="RLV.EnableIfNot"
parameter="showminimap" />
</menu_item_check>
<menu_item_check