History

Merge conflict fix

Niraj Venkat committed 11 years ago

Commit fc612ab1 parent e0366022 files · +0 −6Browse files

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

Unified · Split

interface/src/Application.cpp+0−5
@@ -3287,11 +3287,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 3286 unmodified lines
3287 sceneInterface->setEngineDrawnOverlay3DItems(engineRC->_numDrawnOverlay3DItems);3287 sceneInterface->setEngineDrawnOverlay3DItems(engineRC->_numDrawnOverlay3DItems);
3288 }3288 }
3289 3289
3290 //Render the sixense lasers
3291 if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseLasers)) {
3292 _myAvatar->renderLaserPointers(*renderArgs->_batch);
3293 }
3294
3295 if (!selfAvatarOnly) {3290 if (!selfAvatarOnly) {
3296 // give external parties a change to hook in3291 // give external parties a change to hook in
3297 {3292 {