Merge branch 'master' of https://github.com/worklist/hifi into 19461

Stojce Slavkovski committed 12 years ago

Commit 3e1c8572 parents 1829580 77d291514 files · +154 −93Browse files

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

Unified · Split

interface/src/Menu.cpp+1−1

@@ -1066,7 +1066,7 @@ void Menu::bandwidthDetailsClosed() { · 1065 unmodified lines
1066	void Menu::voxelStatsDetails() {	1066	void Menu::voxelStatsDetails() {
1067	if (!_voxelStatsDialog) {	1067	if (!_voxelStatsDialog) {
1068	_voxelStatsDialog = new VoxelStatsDialog(Application::getInstance()->getGLWidget(),	1068	_voxelStatsDialog = new VoxelStatsDialog(Application::getInstance()->getGLWidget(),
1069	Application::getInstance()->getVoxelSceneStats());	1069	Application::getInstance()->getOcteeSceneStats());
1070	connect(_voxelStatsDialog, SIGNAL(closed()), SLOT(voxelStatsDetailsClosed()));	1070	connect(_voxelStatsDialog, SIGNAL(closed()), SLOT(voxelStatsDetailsClosed()));
1071	_voxelStatsDialog->show();	1071	_voxelStatsDialog->show();
1072	}	1072	}