History

Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction

Andrew Meadows committed 12 years ago

Commit 082b7cf2 parents 8029675 4d55f3566 files · +1222 −847Browse files

Showing the changes to interface/src/Menu.cpp (1 of 66 files). Show all

Unified · Split

interface/src/Menu.cpp+0−1
@@ -321,7 +321,6 @@ Menu::Menu() : · 320 unmodified lines
321321 addCheckableActionToQMenuAndActionHash(voxelOptionsMenu, MenuOption::AmbientOcclusion);
322322 addCheckableActionToQMenuAndActionHash(voxelOptionsMenu, MenuOption::DontFadeOnVoxelServerChanges);
323323 addActionToQMenuAndActionHash(voxelOptionsMenu, MenuOption::LodTools, Qt::SHIFT | Qt::Key_L, this, SLOT(lodTools()));
324− addCheckableActionToQMenuAndActionHash(voxelOptionsMenu, MenuOption::DisableLocalVoxelCache);
325324
326325 QMenu* voxelProtoOptionsMenu = voxelOptionsMenu->addMenu("Voxel Server Protocol Options");
327326

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t