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

Merge pull request #5410 from kevinmthomas-carpool/20618

Browse source 
CR for Job #20618 - Move Reload Content item to Developer menu.
This commit is contained in:
Brad Hefta-Gaub 2015-07-26 21:54:55 -07:00
commit a9d5723eb3
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Menu.cpp
View file

@ -252,8 +252,6 @@ Menu::Menu() {
avatar, SLOT(updateMotionBehavior())); avatar, SLOT(updateMotionBehavior()));
MenuWrapper* viewMenu = addMenu("View"); MenuWrapper* viewMenu = addMenu("View");
addActionToQMenuAndActionHash(viewMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()));
addCheckableActionToQMenuAndActionHash(viewMenu, addCheckableActionToQMenuAndActionHash(viewMenu,
MenuOption::Fullscreen, MenuOption::Fullscreen,
@ -489,6 +487,7 @@ Menu::Menu() {
#endif #endif
MenuWrapper* networkMenu = developerMenu->addMenu("Network"); MenuWrapper* networkMenu = developerMenu->addMenu("Network");
addActionToQMenuAndActionHash(networkMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()));
addCheckableActionToQMenuAndActionHash(networkMenu, MenuOption::DisableNackPackets, 0, false, addCheckableActionToQMenuAndActionHash(networkMenu, MenuOption::DisableNackPackets, 0, false,
qApp->getEntityEditPacketSender(), qApp->getEntityEditPacketSender(),
SLOT(toggleNackPackets())); SLOT(toggleNackPackets()));