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

rebase fix

Browse source
This commit is contained in:
Atlante45 2015-10-06 14:01:28 -07:00
parent ed13c02075
commit 8a7871e15b
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/octree/OctreeServer.cpp
View file

@ -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_SHORT_TIME = 10.0f;
const float MAX_LONG_TIME = 100.0f; const float MAX_LONG_TIME = 100.0f;
if (time == SKIP_TIME) { if (time == SKIP_TIME) {

4
interface/src/scripting/HMDScriptingInterface.cpp
View file

@ -70,3 +70,7 @@ void HMDScriptingInterface::toggleMagnifier() {
bool HMDScriptingInterface::getMagnifier() const { bool HMDScriptingInterface::getMagnifier() const {
return qApp->getApplicationCompositor().hasMagnifier(); return qApp->getApplicationCompositor().hasMagnifier();
} }
bool HMDScriptingInterface::isHMDMode() const {
return qApp->isHMDMode();
}