Showing the changes to interface/src/Menu.cpp (1 of 5 files). Show all
Unified · Split
| @@ -830,9 +830,9 @@ void Menu::editPreferences() { · 829 unmodified lines | |||
| 830 | applicationInstance->getProfile()->setFaceModelURL(faceModelURL); | 830 | applicationInstance->getProfile()->setFaceModelURL(faceModelURL); |
| 831 | 831 | ||
| 832 | // send the new face mesh URL to the data-server (if we have a client UUID) | 832 | // send the new face mesh URL to the data-server (if we have a client UUID) |
| 833 | DataServerClient::putValueForKeyAndUsername(DataServerKey::FaceMeshURL, | 833 | DataServerClient::putValueForKeyAndUserString(DataServerKey::FaceMeshURL, |
| 834 | faceModelURL.toString().toLocal8Bit().constData(), | 834 | faceModelURL.toString().toLocal8Bit().constData(), |
| 835 | applicationInstance->getProfile()->getUsername()); | 835 | applicationInstance->getProfile()->getUserString()); |
| 836 | } | 836 | } |
| 837 | 837 | ||
| 838 | QUrl skeletonModelURL(skeletonURLEdit->text()); | 838 | QUrl skeletonModelURL(skeletonURLEdit->text()); |
| @@ -842,9 +842,9 @@ void Menu::editPreferences() { · 3 unmodified lines | |||
| 842 | applicationInstance->getProfile()->setSkeletonModelURL(skeletonModelURL); | 842 | applicationInstance->getProfile()->setSkeletonModelURL(skeletonModelURL); |
| 843 | 843 | ||
| 844 | // send the new skeleton model URL to the data-server (if we have a client UUID) | 844 | // send the new skeleton model URL to the data-server (if we have a client UUID) |
| 845 | DataServerClient::putValueForKeyAndUsername(DataServerKey::SkeletonURL, | 845 | DataServerClient::putValueForKeyAndUserString(DataServerKey::SkeletonURL, |
| 846 | skeletonModelURL.toString().toLocal8Bit().constData(), | 846 | skeletonModelURL.toString().toLocal8Bit().constData(), |
| 847 | applicationInstance->getProfile()->getUsername()); | 847 | applicationInstance->getProfile()->getUserString()); |
| 848 | } | 848 | } |
| 849 | 849 | ||
| 850 | applicationInstance->getAvatar()->getHead().setPupilDilation(pupilDilation->value() / (float)pupilDilation->maximum()); | 850 | applicationInstance->getAvatar()->getHead().setPupilDilation(pupilDilation->value() / (float)pupilDilation->maximum()); |
| @@ -963,7 +963,7 @@ void Menu::goToUser() { · 112 unmodified lines | |||
| 963 | int dialogReturn = userDialog.exec(); | 963 | int dialogReturn = userDialog.exec(); |
| 964 | if (dialogReturn == QDialog::Accepted && !userDialog.textValue().isEmpty()) { | 964 | if (dialogReturn == QDialog::Accepted && !userDialog.textValue().isEmpty()) { |
| 965 | // there's a username entered by the user, make a request to the data-server | 965 | // there's a username entered by the user, make a request to the data-server |
| 966 | DataServerClient::getValuesForKeysAndUsername( | 966 | DataServerClient::getValuesForKeysAndUserString( |
| 967 | QStringList() << DataServerKey::Domain << DataServerKey::Position << DataServerKey::Orientation, | 967 | QStringList() << DataServerKey::Domain << DataServerKey::Position << DataServerKey::Orientation, |
| 968 | userDialog.textValue(), Application::getInstance()->getProfile()); | 968 | userDialog.textValue(), Application::getInstance()->getProfile()); |
| 969 | } | 969 | } |