History

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

ZappoMan committed 12 years ago

Commit 8d53fc92 parents 2832c33 89cf2f916 files · +169 −58Browse files

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

Unified · Split

interface/src/Application.cpp+3−4
@@ -1487,8 +1487,7 @@ void Application::init() { · 1486 unmodified lines
1487 _myCamera.setModeShiftPeriod(1.0f);1487 _myCamera.setModeShiftPeriod(1.0f);
1488 1488
1489 _mirrorCamera.setMode(CAMERA_MODE_MIRROR);1489 _mirrorCamera.setMode(CAMERA_MODE_MIRROR);
1490 _mirrorCamera.setAspectRatio((float)MIRROR_VIEW_WIDTH / (float)MIRROR_VIEW_HEIGHT);1490 _mirrorCamera.setModeShiftPeriod(0.0f);
1491 _mirrorCamera.setFieldOfView(30);
1492 1491
1493 OculusManager::connect();1492 OculusManager::connect();
1494 if (OculusManager::isConnected()) {1493 if (OculusManager::isConnected()) {
@@ -3368,9 +3367,9 @@ void Application::connectedToDomain(const QString& hostname) { · 1873 unmodified lines
3368 if (accountManager.isLoggedIn()) {3367 if (accountManager.isLoggedIn()) {
3369 // update our domain-server with the data-server we're logged in with3368 // update our domain-server with the data-server we're logged in with
3370 3369
3371 QString domainPutJsonString = "{\"location\":{\"domain\":\"" + hostname + "\"}}";3370 QString domainPutJsonString = "{\"address\":{\"domain\":\"" + hostname + "\"}}";
3372 3371
3373 accountManager.authenticatedRequest("/api/v1/users/location", QNetworkAccessManager::PutOperation,3372 accountManager.authenticatedRequest("/api/v1/users/address", QNetworkAccessManager::PutOperation,
3374 JSONCallbackParameters(), domainPutJsonString.toUtf8());3373 JSONCallbackParameters(), domainPutJsonString.toUtf8());
3375 }3374 }
3376}3375}

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