History

cleanup DSC api, add scripting interface

Stephen Birarda committed 12 years ago

Commit 36137731 parent 340ae8e7 files · +122 −78Browse files

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

Unified · Split

interface/src/Menu.cpp+7−5
@@ -830,8 +830,9 @@ void Menu::editPreferences() { · 829 unmodified lines
830830 applicationInstance->getProfile()->setFaceModelURL(faceModelURL);
831831
832832 // send the new face mesh URL to the data-server (if we have a client UUID)
833− DataServerClient::putValueForKey(DataServerKey::FaceMeshURL,
834− faceModelURL.toString().toLocal8Bit().constData());
833+ DataServerClient::putValueForKeyAndUsername(DataServerKey::FaceMeshURL,
834+ faceModelURL.toString().toLocal8Bit().constData(),
835+ applicationInstance->getProfile()->getUsername());
835836 }
836837
837838 QUrl skeletonModelURL(skeletonURLEdit->text());
@@ -841,8 +842,9 @@ void Menu::editPreferences() { · 3 unmodified lines
841842 applicationInstance->getProfile()->setSkeletonModelURL(skeletonModelURL);
842843
843844 // send the new skeleton model URL to the data-server (if we have a client UUID)
844− DataServerClient::putValueForKey(DataServerKey::SkeletonURL,
845− skeletonModelURL.toString().toLocal8Bit().constData());
845+ DataServerClient::putValueForKeyAndUsername(DataServerKey::SkeletonURL,
846+ skeletonModelURL.toString().toLocal8Bit().constData(),
847+ applicationInstance->getProfile()->getUsername());
846848 }
847849
848850 applicationInstance->getAvatar()->getHead().setPupilDilation(pupilDilation->value() / (float)pupilDilation->maximum());
@@ -961,7 +963,7 @@ void Menu::goToUser() { · 112 unmodified lines
961963 int dialogReturn = userDialog.exec();
962964 if (dialogReturn == QDialog::Accepted && !userDialog.textValue().isEmpty()) {
963965 // there's a username entered by the user, make a request to the data-server
964− DataServerClient::getValuesForKeysAndUserString(
966+ DataServerClient::getValuesForKeysAndUsername(
965967 QStringList() << DataServerKey::Domain << DataServerKey::Position << DataServerKey::Orientation,
966968 userDialog.textValue(), Application::getInstance()->getProfile());
967969 }