History

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

Andrew Meadows committed 12 years ago

Commit 4edc6cd2 parents e73c9f7 ac9e27327 files · +930 −101Browse files

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

Unified · Split

interface/src/Menu.cpp+2−0
@@ -778,11 +778,13 @@ void Menu::editPreferences() { · 777 unmodified lines
778 QString faceURLString = applicationInstance->getAvatar()->getHead().getFaceModel().getURL().toString();778 QString faceURLString = applicationInstance->getAvatar()->getHead().getFaceModel().getURL().toString();
779 QLineEdit* faceURLEdit = new QLineEdit(faceURLString);779 QLineEdit* faceURLEdit = new QLineEdit(faceURLString);
780 faceURLEdit->setMinimumWidth(QLINE_MINIMUM_WIDTH);780 faceURLEdit->setMinimumWidth(QLINE_MINIMUM_WIDTH);
781 faceURLEdit->setPlaceholderText(DEFAULT_HEAD_MODEL_URL.toString());
781 form->addRow("Face URL:", faceURLEdit);782 form->addRow("Face URL:", faceURLEdit);
782 783
783 QString skeletonURLString = applicationInstance->getAvatar()->getSkeletonModel().getURL().toString();784 QString skeletonURLString = applicationInstance->getAvatar()->getSkeletonModel().getURL().toString();
784 QLineEdit* skeletonURLEdit = new QLineEdit(skeletonURLString);785 QLineEdit* skeletonURLEdit = new QLineEdit(skeletonURLString);
785 skeletonURLEdit->setMinimumWidth(QLINE_MINIMUM_WIDTH);786 skeletonURLEdit->setMinimumWidth(QLINE_MINIMUM_WIDTH);
787 skeletonURLEdit->setPlaceholderText(DEFAULT_BODY_MODEL_URL.toString());
786 form->addRow("Skeleton URL:", skeletonURLEdit);788 form->addRow("Skeleton URL:", skeletonURLEdit);
787 789
788 QSlider* pupilDilation = new QSlider(Qt::Horizontal);790 QSlider* pupilDilation = new QSlider(Qt::Horizontal);