History

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

ZappoMan committed 13 years ago

Commit 46eadb52 parents 161367c c87ddd229 files · +1206 −534Browse files

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

Unified · Split

interface/src/Application.cpp+4−2
@@ -1375,7 +1375,8 @@ void Application::processAvatarURLsMessage(unsigned char* packetData, size_t dat · 1374 unmodified lines
1375 QMetaObject::invokeMethod(avatar->getVoxels(), "setVoxelURL", Q_ARG(QUrl, voxelURL));1375 QMetaObject::invokeMethod(avatar->getVoxels(), "setVoxelURL", Q_ARG(QUrl, voxelURL));
1376 1376
1377 // use this timing to as the data-server for an updated mesh for this avatar (if we have UUID)1377 // use this timing to as the data-server for an updated mesh for this avatar (if we have UUID)
1378 DataServerClient::getValueForKeyAndUUID(DataServerKey::FaceMeshURL, avatar->getUUID());1378 DataServerClient::getValuesForKeysAndUUID(QStringList() << DataServerKey::FaceMeshURL << DataServerKey::SkeletonURL,
1379 avatar->getUUID());
1379}1380}
1380 1381
1381void Application::processAvatarFaceVideoMessage(unsigned char* packetData, size_t dataBytes) {1382void Application::processAvatarFaceVideoMessage(unsigned char* packetData, size_t dataBytes) {
@@ -1383,7 +1384,7 @@ void Application::processAvatarFaceVideoMessage(unsigned char* packetData, size_ · 1 unmodified line
1383 if (!avatar) {1384 if (!avatar) {
1384 return;1385 return;
1385 }1386 }
1386 avatar->getHead().getFace().processVideoMessage(packetData, dataBytes);1387 avatar->getHead().getVideoFace().processVideoMessage(packetData, dataBytes);
1387}1388}
1388 1389
1389void Application::checkBandwidthMeterClick() {1390void Application::checkBandwidthMeterClick() {
@@ -1690,6 +1691,7 @@ void Application::init() { · 300 unmodified lines
1690 if (!_profile.getUsername().isEmpty()) {1691 if (!_profile.getUsername().isEmpty()) {
1691 // we have a username for this avatar, ask the data-server for the mesh URL for this avatar1692 // we have a username for this avatar, ask the data-server for the mesh URL for this avatar
1692 DataServerClient::getClientValueForKey(DataServerKey::FaceMeshURL);1693 DataServerClient::getClientValueForKey(DataServerKey::FaceMeshURL);
1694 DataServerClient::getClientValueForKey(DataServerKey::SkeletonURL);
1693 }1695 }
1694 1696
1695 // Set up VoxelSystem after loading preferences so we can get the desired max voxel count 1697 // Set up VoxelSystem after loading preferences so we can get the desired max voxel count

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