History

Merge branch 'master' of git://github.com/worklist/hifi into windows_build

Brad Hefta-Gaub committed 12 years ago

Commit 392ff942 parents b947d1e 0f2aa6c11 files · +95 −53Browse files

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

Unified · Split

interface/src/Menu.cpp+4−3
@@ -897,7 +897,7 @@ void Menu::editPreferences() { · 896 unmodified lines
897 _maxVoxelPacketsPerSecond = maxVoxelsPPS->value();897 _maxVoxelPacketsPerSecond = maxVoxelsPPS->value();
898 898
899 applicationInstance->getAvatar()->setLeanScale(leanScale->value());899 applicationInstance->getAvatar()->setLeanScale(leanScale->value());
900 applicationInstance->getAvatar()->setNewScale(avatarScale->value());900 applicationInstance->getAvatar()->setClampedTargetScale(avatarScale->value());
901 901
902 _audioJitterBufferSamples = audioJitterBufferSamples->value();902 _audioJitterBufferSamples = audioJitterBufferSamples->value();
903 903
@@ -1005,8 +1005,9 @@ void Menu::goToUser() { · 101 unmodified lines
1005 int dialogReturn = userDialog.exec();1005 int dialogReturn = userDialog.exec();
1006 if (dialogReturn == QDialog::Accepted && !userDialog.textValue().isEmpty()) {1006 if (dialogReturn == QDialog::Accepted && !userDialog.textValue().isEmpty()) {
1007 // there's a username entered by the user, make a request to the data-server1007 // there's a username entered by the user, make a request to the data-server
1008 DataServerClient::getValuesForKeysAndUserString((QStringList() << DataServerKey::Domain << DataServerKey::Position),1008 DataServerClient::getValuesForKeysAndUserString(
1009 userDialog.textValue());1009 QStringList() << DataServerKey::Domain << DataServerKey::Position << DataServerKey::Orientation,
1010 userDialog.textValue());
1010 }1011 }
1011 1012
1012 sendFakeEnterEvent();1013 sendFakeEnterEvent();