History

Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction

Andrew Meadows committed 12 years ago

Commit 55652632 parents e4e4958 3c5cd8587 files · +5986 −1477Browse files

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

Unified · Split

interface/src/Menu.cpp+7−5
@@ -834,8 +834,9 @@ void Menu::editPreferences() { · 833 unmodified lines
834 applicationInstance->getProfile()->setFaceModelURL(faceModelURL);834 applicationInstance->getProfile()->setFaceModelURL(faceModelURL);
835 835
836 // send the new face mesh URL to the data-server (if we have a client UUID)836 // send the new face mesh URL to the data-server (if we have a client UUID)
837 DataServerClient::putValueForKey(DataServerKey::FaceMeshURL,837 DataServerClient::putValueForKeyAndUserString(DataServerKey::FaceMeshURL,
838 faceModelURL.toString().toLocal8Bit().constData());838 faceModelURL.toString().toLocal8Bit().constData(),
839 applicationInstance->getProfile()->getUserString());
839 }840 }
840 841
841 QUrl skeletonModelURL(skeletonURLEdit->text());842 QUrl skeletonModelURL(skeletonURLEdit->text());
@@ -845,8 +846,9 @@ void Menu::editPreferences() { · 3 unmodified lines
845 applicationInstance->getProfile()->setSkeletonModelURL(skeletonModelURL);846 applicationInstance->getProfile()->setSkeletonModelURL(skeletonModelURL);
846 847
847 // send the new skeleton model URL to the data-server (if we have a client UUID)848 // send the new skeleton model URL to the data-server (if we have a client UUID)
848 DataServerClient::putValueForKey(DataServerKey::SkeletonURL,849 DataServerClient::putValueForKeyAndUserString(DataServerKey::SkeletonURL,
849 skeletonModelURL.toString().toLocal8Bit().constData());850 skeletonModelURL.toString().toLocal8Bit().constData(),
851 applicationInstance->getProfile()->getUserString());
850 }852 }
851 853
852 applicationInstance->getAvatar()->getHead().setPupilDilation(pupilDilation->value() / (float)pupilDilation->maximum());854 applicationInstance->getAvatar()->getHead().setPupilDilation(pupilDilation->value() / (float)pupilDilation->maximum());
@@ -967,7 +969,7 @@ void Menu::goToUser() { · 114 unmodified lines
967 // there's a username entered by the user, make a request to the data-server969 // there's a username entered by the user, make a request to the data-server
968 DataServerClient::getValuesForKeysAndUserString(970 DataServerClient::getValuesForKeysAndUserString(
969 QStringList() << DataServerKey::Domain << DataServerKey::Position << DataServerKey::Orientation,971 QStringList() << DataServerKey::Domain << DataServerKey::Position << DataServerKey::Orientation,
970 userDialog.textValue());972 userDialog.textValue(), Application::getInstance()->getProfile());
971 }973 }
972 974
973 sendFakeEnterEvent();975 sendFakeEnterEvent();