History

Remove dead code.

Howard Stearns committed 11 years ago

Commit 62941c01 parent ea834609 files · +12 −225Browse files

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

Unified · Split

interface/src/Application.cpp+3−24
@@ -3896,23 +3896,12 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 3895 unmodified lines
3896 QMessageBox msgBox;3896 QMessageBox msgBox;
3897 msgBox.setIcon(QMessageBox::Question);3897 msgBox.setIcon(QMessageBox::Question);
3898 msgBox.setWindowTitle("Set Avatar");3898 msgBox.setWindowTitle("Set Avatar");
3899 QPushButton* headButton = NULL;
3900 QPushButton* bodyButton = NULL;
3901 QPushButton* bodyAndHeadButton = NULL;3899 QPushButton* bodyAndHeadButton = NULL;
3902 3900
3903 QString modelName = fstMapping["name"].toString();3901 QString modelName = fstMapping["name"].toString();
3904 QString message;3902 QString message;
3905 QString typeInfo;3903 QString typeInfo;
3906 switch (modelType) {3904 switch (modelType) {
3907 case FSTReader::HEAD_MODEL:
3908 message = QString("Would you like to use '") + modelName + QString("' for your avatar head?");
3909 headButton = msgBox.addButton(tr("Yes"), QMessageBox::ActionRole);
3910 break;
3911
3912 case FSTReader::BODY_ONLY_MODEL:
3913 message = QString("Would you like to use '") + modelName + QString("' for your avatar body?");
3914 bodyButton = msgBox.addButton(tr("Yes"), QMessageBox::ActionRole);
3915 break;
3916 3905
3917 case FSTReader::HEAD_AND_BODY_MODEL:3906 case FSTReader::HEAD_AND_BODY_MODEL:
3918 message = QString("Would you like to use '") + modelName + QString("' for your avatar?");3907 message = QString("Would you like to use '") + modelName + QString("' for your avatar?");
@@ -3920,10 +3909,7 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 1 unmodified line
3920 break;3909 break;
3921 3910
3922 default:3911 default:
3923 message = QString("Would you like to use '") + modelName + QString("' for some part of your avatar head?");3912 message = QString(modelName + QString("Does not support a head and body as required."));
3924 headButton = msgBox.addButton(tr("Use for Head"), QMessageBox::ActionRole);
3925 bodyButton = msgBox.addButton(tr("Use for Body"), QMessageBox::ActionRole);
3926 bodyAndHeadButton = msgBox.addButton(tr("Use for Body and Head"), QMessageBox::ActionRole);
3927 break;3913 break;
3928 }3914 }
3929 3915
@@ -3932,14 +3918,7 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 2 unmodified lines
3932 3918
3933 msgBox.exec();3919 msgBox.exec();
3934 3920
3935 if (msgBox.clickedButton() == headButton) {3921 if (msgBox.clickedButton() == bodyAndHeadButton) {
3936 _myAvatar->useHeadURL(url, modelName);
3937 emit headURLChanged(url, modelName);
3938 } else if (msgBox.clickedButton() == bodyButton) {
3939 _myAvatar->useBodyURL(url, modelName);
3940 emit bodyURLChanged(url, modelName);
3941 } else if (msgBox.clickedButton() == bodyAndHeadButton) {
3942 _myAvatar->useFullAvatarURL(url, modelName);
3943 emit fullAvatarURLChanged(url, modelName);3922 emit fullAvatarURLChanged(url, modelName);
3944 } else {3923 } else {
3945 qCDebug(interfaceapp) << "Declined to use the avatar: " << url;3924 qCDebug(interfaceapp) << "Declined to use the avatar: " << url;
@@ -4426,7 +4405,7 @@ void Application::checkSkeleton() { · 480 unmodified lines
4426 msgBox.setIcon(QMessageBox::Warning);4405 msgBox.setIcon(QMessageBox::Warning);
4427 msgBox.exec();4406 msgBox.exec();
4428 4407
4429 _myAvatar->useBodyURL(DEFAULT_BODY_MODEL_URL, "Default");4408 _myAvatar->useFullAvatarURL(DEFAULT_FULL_AVATAR_MODEL_URL, DEFAULT_FULL_AVATAR_MODEL_NAME);
4430 } else {4409 } else {
4431 _physicsEngine.setCharacterController(_myAvatar->getCharacterController());4410 _physicsEngine.setCharacterController(_myAvatar->getCharacterController());
4432 }4411 }