History

store username and not UUID for MyAvatar

Stephen Birarda committed 13 years ago

Commit f36fd471 parent 98f435c5 files · +41 −36Browse files

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

Unified · Split

interface/src/Menu.cpp+7−8
@@ -749,10 +749,10 @@ void Menu::editPreferences() { · 748 unmodified lines
749 QFormLayout* form = new QFormLayout();749 QFormLayout* form = new QFormLayout();
750 layout->addLayout(form, 1);750 layout->addLayout(form, 1);
751 751
752 QUuid avatarUUID = applicationInstance->getAvatar()->getUUID();752 QString avatarUsername = applicationInstance->getAvatar()->getUsername();
753 QLineEdit* avatarUUIDLineEdit = new QLineEdit(avatarUUID.isNull() ? QString() : uuidStringWithoutCurlyBraces(avatarUUID));753 QLineEdit* avatarUsernameEdit = new QLineEdit(avatarUsername);
754 avatarUUIDLineEdit->setMinimumWidth(QLINE_MINIMUM_WIDTH);754 avatarUsernameEdit->setMinimumWidth(QLINE_MINIMUM_WIDTH);
755 form->addRow("UUID:", avatarUUIDLineEdit);755 form->addRow("Username:", avatarUsernameEdit);
756 756
757 QLineEdit* avatarURL = new QLineEdit(applicationInstance->getAvatar()->getVoxels()->getVoxelURL().toString());757 QLineEdit* avatarURL = new QLineEdit(applicationInstance->getAvatar()->getVoxels()->getVoxelURL().toString());
758 avatarURL->setMinimumWidth(QLINE_MINIMUM_WIDTH);758 avatarURL->setMinimumWidth(QLINE_MINIMUM_WIDTH);
@@ -804,10 +804,9 @@ void Menu::editPreferences() { · 45 unmodified lines
804 return;804 return;
805 }805 }
806 806
807 QUuid newUUID(avatarUUIDLineEdit->text());807 if (avatarUsernameEdit->text() != avatarUsername) {
808 if (newUUID != avatarUUID) {
809 // there has been a UUID change - set the new UUID on the avatar instance808 // there has been a UUID change - set the new UUID on the avatar instance
810 applicationInstance->getAvatar()->setUUID(newUUID);809 applicationInstance->getAvatar()->setUsername(avatarUsernameEdit->text());
811 810
812 }811 }
813 812
@@ -819,7 +818,7 @@ void Menu::editPreferences() { · 5 unmodified lines
819 applicationInstance->getAvatar()->getHead().getBlendFace().setModelURL(faceModelURL);818 applicationInstance->getAvatar()->getHead().getBlendFace().setModelURL(faceModelURL);
820 819
821 // send the new face mesh URL to the data-server (if we have a client UUID)820 // send the new face mesh URL to the data-server (if we have a client UUID)
822 DataServerClient::putValueForKey("mesh", faceModelURL.toString().toLocal8Bit().constData()); 821 DataServerClient::putValueForKey("mesh", faceModelURL.toString().toLocal8Bit().constData());
823 }822 }
824 823
825 Avatar::sendAvatarURLsMessage(avatarVoxelURL, faceModelURL);824 Avatar::sendAvatarURLsMessage(avatarVoxelURL, faceModelURL);