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

20
indra/newview/llviewermenu.cpp
View File

@@ -858,6 +858,7 @@ void init_menus()
menu->setCanTearOff(TRUE);
init_client_menu(menu);
gMenuBarView->addChild( menu );
rlvMenuToggleVisible();
menu = new LLMenuGL(SERVER_MENU_NAME);
menu->setCanTearOff(TRUE);
@@ -1062,15 +1063,13 @@ void init_client_menu(LLMenuGL* menu)
// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-0.2.1b | OK
#ifdef RLV_ADVANCED_MENU
if (rlv_handler_t::isEnabled())
{
sub_menu = new LLMenuGL("RLVa");
sub_menu->setCanTearOff(TRUE);
init_debug_rlva_menu(sub_menu);
menu->addChild(sub_menu);
sub_menu->setVisible(rlv_handler_t::isEnabled());
sub_menu->setEnabled(rlv_handler_t::isEnabled());
}
sub_menu = new LLMenuGL("RLVa Embedded");
init_debug_rlva_menu(sub_menu);
menu->addChild(sub_menu);
// Top Level Menu as well
sub_menu = new LLMenuGL("RLVa Main");
init_debug_rlva_menu(sub_menu);
gMenuBarView->addChild(sub_menu);
#endif // RLV_ADVANCED_MENU
// [/RLVa:KB]
@@ -1695,6 +1694,9 @@ void init_debug_avatar_menu(LLMenuGL* menu)
// [RLVa:KB] - Checked: 2009-11-17 (RLVa-1.1.0d) | Modified: RLVa-1.1.0d | OK
void init_debug_rlva_menu(LLMenuGL* menu)
{
menu->setLabel(std::string("RLVa")); // Same menu, same label
menu->setCanTearOff(true);
// Debug options
{
LLMenuGL* pDbgMenu = new LLMenuGL("Debug");