Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 11:37:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Menu.cpp

Browse source
This commit is contained in:
Kevin M. Thomas 2015-07-24 15:16:02 -04:00
parent 5f7fe30b9b
commit 67c9a33cc0
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Menu.cpp
View file

@ -487,14 +487,10 @@ Menu::Menu() {
#endif #endif
MenuWrapper* networkMenu = developerMenu->addMenu("Network"); MenuWrapper* networkMenu = developerMenu->addMenu("Network");
<<<<<<< HEAD
addActionToQMenuAndActionHash(networkMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches())); addActionToQMenuAndActionHash(networkMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()));
addCheckableActionToQMenuAndActionHash(networkMenu, MenuOption::DisableNackPackets, 0, false);
=======
addCheckableActionToQMenuAndActionHash(networkMenu, MenuOption::DisableNackPackets, 0, false, addCheckableActionToQMenuAndActionHash(networkMenu, MenuOption::DisableNackPackets, 0, false,
qApp->getEntityEditPacketSender(), qApp->getEntityEditPacketSender(),
SLOT(toggleNackPackets())); SLOT(toggleNackPackets()));
>>>>>>> f3dc159e336b7b580bbd39b367802b0099e66ccb
addCheckableActionToQMenuAndActionHash(networkMenu, addCheckableActionToQMenuAndActionHash(networkMenu,
MenuOption::DisableActivityLogger, MenuOption::DisableActivityLogger,
0, 0,