From 8a7871e15bbada9f21afc4ea4b4fde99c7dd899b Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 6 Oct 2015 14:01:28 -0700 Subject: [PATCH] rebase fix --- assignment-client/src/octree/OctreeServer.cpp | 2 +- interface/src/scripting/HMDScriptingInterface.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp index 7899591998..ee0403d57b 100644 --- a/assignment-client/src/octree/OctreeServer.cpp +++ b/assignment-client/src/octree/OctreeServer.cpp @@ -191,7 +191,7 @@ void OctreeServer::trackPacketSendingTime(float time) { } -void OctreeServer::trackProcessWaitTime(float time) +void OctreeServer::trackProcessWaitTime(float time) { const float MAX_SHORT_TIME = 10.0f; const float MAX_LONG_TIME = 100.0f; if (time == SKIP_TIME) { diff --git a/interface/src/scripting/HMDScriptingInterface.cpp b/interface/src/scripting/HMDScriptingInterface.cpp index b3630a4453..f9a8fc1493 100644 --- a/interface/src/scripting/HMDScriptingInterface.cpp +++ b/interface/src/scripting/HMDScriptingInterface.cpp @@ -70,3 +70,7 @@ void HMDScriptingInterface::toggleMagnifier() { bool HMDScriptingInterface::getMagnifier() const { return qApp->getApplicationCompositor().hasMagnifier(); } + +bool HMDScriptingInterface::isHMDMode() const { + return qApp->isHMDMode(); +}