Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lirusato/master'

Browse Source
This commit is contained in:
Latif Khalifa
2013-01-22 20:06:03 +01:00
parent b758014ebc dd1e9a68d4
commit d8c846288e
32 changed files with 311 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/rlvhandler.cpp
View File

@@ -1054,14 +1054,6 @@ BOOL RlvHandler::setEnabled(BOOL fEnable)
RlvUIEnabler::getInstance();
}
// RELEASE-RLVa: LL defines CLIENT_MENU_NAME but we can't get to it from here so we need to keep those two in sync manually
LLMenuGL* pClientMenu = NULL;
if ( (gMenuBarView) && ((pClientMenu = gMenuBarView->getChildMenuByName("Advanced", FALSE)) != NULL) )
{
pClientMenu->setItemVisible("RLVa", m_fEnabled);
pClientMenu->setItemEnabled("RLVa", m_fEnabled);
}
return m_fEnabled; // Return enabled/disabled state
}