Merge pull request #4642 from ZappoMan/avatarUI

New Avatar UI

interface/src/Application.cpp

@@ -3719,17 +3719,7 @@ bool Application::askToSetAvatarUrl(const QString& url) {
     }
     
     // Download the FST file, to attempt to determine its model type
-    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+    QVariantHash fstMapping = FSTReader::downloadMapping(url);
-    QNetworkRequest networkRequest = QNetworkRequest(url);
-    networkRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
-    QNetworkReply* reply = networkAccessManager.get(networkRequest);
-    qCDebug(interfaceapp) << "Downloading avatar file at " << url;
-    QEventLoop loop;
-    QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
-    loop.exec();
-    QByteArray fstContents = reply->readAll();
-    delete reply;
-    QVariantHash fstMapping = FSTReader::readMapping(fstContents);
     
     FSTReader::ModelType modelType = FSTReader::predictModelType(fstMapping);
     
@@ -3740,26 +3730,27 @@ bool Application::askToSetAvatarUrl(const QString& url) {
     QPushButton* bodyButton = NULL;
     QPushButton* bodyAndHeadButton = NULL;
     
+    QString modelName = fstMapping["name"].toString();
     QString message;
     QString typeInfo;
     switch (modelType) {
         case FSTReader::HEAD_MODEL:
-            message = QString("Would you like to use '") + fstMapping["name"].toString() + QString("' for your avatar head?");
+            message = QString("Would you like to use '") + modelName + QString("' for your avatar head?");
             headButton = msgBox.addButton(tr("Yes"), QMessageBox::ActionRole);
         break;
 
         case FSTReader::BODY_ONLY_MODEL:
-            message = QString("Would you like to use '") + fstMapping["name"].toString() + QString("' for your avatar body?");
+            message = QString("Would you like to use '") + modelName + QString("' for your avatar body?");
             bodyButton = msgBox.addButton(tr("Yes"), QMessageBox::ActionRole);
         break;
 
         case FSTReader::HEAD_AND_BODY_MODEL:
-            message = QString("Would you like to use '") + fstMapping["name"].toString() + QString("' for your avatar?");
+            message = QString("Would you like to use '") + modelName + QString("' for your avatar?");
             bodyAndHeadButton = msgBox.addButton(tr("Yes"), QMessageBox::ActionRole);
         break;
         
         default:
-            message = QString("Would you like to use '") + fstMapping["name"].toString() + QString("' for some part of your avatar head?");
+            message = QString("Would you like to use '") + modelName + QString("' for some part of your avatar head?");
             headButton = msgBox.addButton(tr("Use for Head"), QMessageBox::ActionRole);
             bodyButton = msgBox.addButton(tr("Use for Body"), QMessageBox::ActionRole);
             bodyAndHeadButton = msgBox.addButton(tr("Use for Body and Head"), QMessageBox::ActionRole);
@@ -3772,34 +3763,18 @@ bool Application::askToSetAvatarUrl(const QString& url) {
     msgBox.exec();
 
     if (msgBox.clickedButton() == headButton) {
-        qCDebug(interfaceapp) << "Chose to use for head: " << url;
+        _myAvatar->useHeadURL(url, modelName);
-        _myAvatar->setFaceModelURL(url);
+        emit headURLChanged(url, modelName);
-        UserActivityLogger::getInstance().changedModel("head", url);
-        _myAvatar->sendIdentityPacket();
-        emit faceURLChanged(url);
     } else if (msgBox.clickedButton() == bodyButton) {
-        qCDebug(interfaceapp) << "Chose to use for body: " << url;
+        _myAvatar->useBodyURL(url, modelName);
-        _myAvatar->setSkeletonModelURL(url);
+        emit bodyURLChanged(url, modelName);
-        // if the head is empty, reset it to the default head.
-        if (_myAvatar->getFaceModelURLString().isEmpty()) {
-            _myAvatar->setFaceModelURL(DEFAULT_HEAD_MODEL_URL);
-            emit faceURLChanged(DEFAULT_HEAD_MODEL_URL.toString());
-            UserActivityLogger::getInstance().changedModel("head", DEFAULT_HEAD_MODEL_URL.toString());
-        }
-        UserActivityLogger::getInstance().changedModel("skeleton", url);
-        _myAvatar->sendIdentityPacket();
-        emit skeletonURLChanged(url);
     } else if (msgBox.clickedButton() == bodyAndHeadButton) {
-        qCDebug(interfaceapp) << "Chose to use for body + head: " << url;
+        _myAvatar->useFullAvatarURL(url, modelName);
-        _myAvatar->setFaceModelURL(QString());
+        emit fullAvatarURLChanged(url, modelName);
-        _myAvatar->setSkeletonModelURL(url);
-        UserActivityLogger::getInstance().changedModel("skeleton", url);
-        _myAvatar->sendIdentityPacket();
-        emit faceURLChanged(QString());
-        emit skeletonURLChanged(url);
     } else {
         qCDebug(interfaceapp) << "Declined to use the avatar: " << url;
     }
+    
     return true;
 }
 
@@ -4311,8 +4286,7 @@ void Application::checkSkeleton() {
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.exec();
         
-        _myAvatar->setSkeletonModelURL(DEFAULT_BODY_MODEL_URL);
+        _myAvatar->useBodyURL(DEFAULT_BODY_MODEL_URL, "Default");
-        _myAvatar->sendIdentityPacket();
     } else {
         _myAvatar->updateCharacterController();
         _physicsEngine.setCharacterController(_myAvatar->getCharacterController());

interface/src/Application.h

@@ -337,8 +337,9 @@ signals:
     void checkBackgroundDownloads();
     void domainConnectionRefused(const QString& reason);
 
-    void faceURLChanged(const QString& newValue);
+    void headURLChanged(const QString& newValue, const QString& modelName);
-    void skeletonURLChanged(const QString& newValue);
+    void bodyURLChanged(const QString& newValue, const QString& modelName);
+    void fullAvatarURLChanged(const QString& newValue, const QString& modelName);
     
     void beforeAboutToQuit();
 

interface/src/avatar/MyAvatar.cpp

@@ -31,6 +31,7 @@
 #include <ShapeCollider.h>
 #include <SharedUtil.h>
 #include <TextRenderer.h>
+#include <UserActivityLogger.h>
 
 #include "Application.h"
 #include "AvatarManager.h"
@@ -605,10 +606,15 @@ void MyAvatar::saveData() {
 
     settings.setValue("leanScale", _leanScale);
     settings.setValue("scale", _targetScale);
-    
+
-    settings.setValue("faceModelURL", _faceModelURL);
+    settings.setValue("useFullAvatar", _useFullAvatar);
-    settings.setValue("skeletonModelURL", _skeletonModelURL);
+    settings.setValue("fullAvatarURL", _fullAvatarURLFromPreferences);
-    
+    settings.setValue("faceModelURL", _headURLFromPreferences);
+    settings.setValue("skeletonModelURL", _skeletonURLFromPreferences);
+    settings.setValue("headModelName", _headModelName);
+    settings.setValue("bodyModelName", _bodyModelName);
+    settings.setValue("fullAvatarModelName", _fullAvatarModelName);
+
     settings.beginWriteArray("attachmentData");
     for (int i = 0; i < _attachmentData.size(); i++) {
         settings.setArrayIndex(i);
@@ -669,9 +675,54 @@ void MyAvatar::loadData() {
     _targetScale = loadSetting(settings, "scale", 1.0f);
     setScale(_scale);
     Application::getInstance()->getCamera()->setScale(_scale);
-    
+
-    setFaceModelURL(settings.value("faceModelURL", DEFAULT_HEAD_MODEL_URL).toUrl());
+
-    setSkeletonModelURL(settings.value("skeletonModelURL").toUrl());
+    // The old preferences only stored the face and skeleton URLs, we didn't track if the user wanted to use 1 or 2 urls 
+    // for their avatar, So we need to attempt to detect this old case and set our new preferences accordingly. If
+    // the head URL is empty, then we will assume they are using a full url...
+    bool isOldSettings = !(settings.contains("useFullAvatar") || settings.contains("fullAvatarURL"));
+
+    _useFullAvatar = settings.value("useFullAvatar").toBool();
+    _headURLFromPreferences = settings.value("faceModelURL", DEFAULT_HEAD_MODEL_URL).toUrl();
+    _fullAvatarURLFromPreferences = settings.value("fullAvatarURL").toUrl();
+    _skeletonURLFromPreferences = settings.value("skeletonModelURL").toUrl();
+    _headModelName = settings.value("headModelName").toString();
+    _bodyModelName = settings.value("bodyModelName").toString();
+    _fullAvatarModelName = settings.value("fullAvatarModelName").toString();;
+
+    if (isOldSettings) {
+        bool assumeFullAvatar = _headURLFromPreferences.isEmpty();
+        _useFullAvatar = assumeFullAvatar;
+
+        if (_useFullAvatar) {
+            _fullAvatarURLFromPreferences = settings.value("skeletonModelURL").toUrl();
+            _headURLFromPreferences = DEFAULT_HEAD_MODEL_URL;
+            _skeletonURLFromPreferences = DEFAULT_BODY_MODEL_URL;
+
+            QVariantHash fullAvatarFST = FSTReader::downloadMapping(_fullAvatarURLFromPreferences.toString());
+
+            _headModelName = "Default";
+            _bodyModelName = "Default";
+            _fullAvatarModelName = fullAvatarFST["name"].toString();
+
+        } else {
+            _fullAvatarURLFromPreferences = DEFAULT_FULL_AVATAR_MODEL_URL;
+            _skeletonURLFromPreferences = settings.value("skeletonModelURL").toUrl();
+
+            QVariantHash headFST = FSTReader::downloadMapping(_headURLFromPreferences.toString());
+            QVariantHash bodyFST = FSTReader::downloadMapping(_skeletonURLFromPreferences.toString());
+
+            _headModelName = headFST["name"].toString();
+            _bodyModelName = bodyFST["name"].toString();
+            _fullAvatarModelName = "Default";
+        }
+    }
+
+    if (_useFullAvatar) {
+        useFullAvatarURL(_fullAvatarURLFromPreferences, _fullAvatarModelName);
+    } else {
+        useHeadAndBodyURLs(_headURLFromPreferences, _skeletonURLFromPreferences, _headModelName, _bodyModelName);
+    }
     
     QVector<AttachmentData> attachmentData;
     int attachmentCount = settings.beginReadArray("attachmentData");
@@ -897,6 +948,29 @@ void MyAvatar::clearJointAnimationPriorities() {
     }
 }
 
+QString MyAvatar::getModelDescription() const {
+    QString result;
+    if (_useFullAvatar) {
+        if (!getFullAvartarModelName().isEmpty()) {
+            result = "Full Avatar \"" + getFullAvartarModelName() + "\"";
+        } else {
+            result = "Full Avatar \"" + _fullAvatarURLFromPreferences.fileName() + "\"";
+        }
+    } else {
+        if (!getHeadModelName().isEmpty()) {
+            result = "Head \"" + getHeadModelName() + "\"";
+        } else {
+            result = "Head \"" + _headURLFromPreferences.fileName() + "\"";
+        }
+        if (!getBodyModelName().isEmpty()) {
+            result += " and Body \"" + getBodyModelName() + "\"";
+        } else {
+            result += " and Body \"" + _skeletonURLFromPreferences.fileName() + "\"";
+        }
+    }
+    return result;
+}
+
 void MyAvatar::setFaceModelURL(const QUrl& faceModelURL) {
     Avatar::setFaceModelURL(faceModelURL);
     _billboardValid = false;
@@ -907,6 +981,74 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
     _billboardValid = false;
 }
 
+void MyAvatar::useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelName) {
+    _useFullAvatar = true;
+    
+    if (_fullAvatarURLFromPreferences != fullAvatarURL) {
+        _fullAvatarURLFromPreferences = fullAvatarURL;
+        if (modelName.isEmpty()) {
+            QVariantHash fullAvatarFST = FSTReader::downloadMapping(_fullAvatarURLFromPreferences.toString());
+            _fullAvatarModelName = fullAvatarFST["name"].toString();
+        } else {     
+            _fullAvatarModelName = modelName;
+        }
+    }
+
+    if (!getFaceModelURLString().isEmpty()) {
+        setFaceModelURL(QString());
+    }
+
+    if (fullAvatarURL != getSkeletonModelURL()) {
+        setSkeletonModelURL(fullAvatarURL);
+        UserActivityLogger::getInstance().changedModel("skeleton", fullAvatarURL.toString());
+    }
+    sendIdentityPacket();
+}
+
+void MyAvatar::useHeadURL(const QUrl& headURL, const QString& modelName) {
+    useHeadAndBodyURLs(headURL, _skeletonURLFromPreferences, modelName, _bodyModelName);
+}
+
+void MyAvatar::useBodyURL(const QUrl& bodyURL, const QString& modelName) {
+    useHeadAndBodyURLs(_headURLFromPreferences, bodyURL, _headModelName, modelName);
+}
+
+void MyAvatar::useHeadAndBodyURLs(const QUrl& headURL, const QUrl& bodyURL, const QString& headName, const QString& bodyName) {
+    _useFullAvatar = false;
+
+    if (_headURLFromPreferences != headURL) {
+        _headURLFromPreferences = headURL;
+        if (headName.isEmpty()) {
+            QVariantHash headFST = FSTReader::downloadMapping(_headURLFromPreferences.toString());
+            _headModelName = headFST["name"].toString();
+        } else {     
+            _headModelName = headName;
+        }
+    }
+
+    if (_skeletonURLFromPreferences != bodyURL) {
+        _skeletonURLFromPreferences = bodyURL;
+        if (bodyName.isEmpty()) {
+            QVariantHash bodyFST = FSTReader::downloadMapping(_skeletonURLFromPreferences.toString());
+            _bodyModelName = bodyFST["name"].toString();
+        } else {     
+            _bodyModelName = bodyName;
+        }
+    }
+
+    if (headURL != getFaceModelURL()) {
+        setFaceModelURL(headURL);
+        UserActivityLogger::getInstance().changedModel("head", headURL.toString());
+    }
+
+    if (bodyURL != getSkeletonModelURL()) {
+        setSkeletonModelURL(bodyURL);
+        UserActivityLogger::getInstance().changedModel("skeleton", bodyURL.toString());
+    }
+    sendIdentityPacket();
+}
+
+
 void MyAvatar::setAttachmentData(const QVector<AttachmentData>& attachmentData) {
     Avatar::setAttachmentData(attachmentData);
     if (QThread::currentThread() != thread()) {

interface/src/avatar/MyAvatar.h

@@ -116,8 +116,23 @@ public:
     virtual void setJointData(int index, const glm::quat& rotation);
     virtual void clearJointData(int index);
     virtual void clearJointsData();
-    virtual void setFaceModelURL(const QUrl& faceModelURL);
+
-    virtual void setSkeletonModelURL(const QUrl& skeletonModelURL);
+    void useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelName = QString());
+    void useHeadURL(const QUrl& headURL, const QString& modelName = QString());
+    void useBodyURL(const QUrl& bodyURL, const QString& modelName = QString());
+    void useHeadAndBodyURLs(const QUrl& headURL, const QUrl& bodyURL, const QString& headName = QString(), const QString& bodyName = QString());
+
+    bool getUseFullAvatar() const { return _useFullAvatar; }
+    const QUrl& getFullAvatarURLFromPreferences() const { return _fullAvatarURLFromPreferences; }
+    const QUrl& getHeadURLFromPreferences() const { return _headURLFromPreferences; }
+    const QUrl& getBodyURLFromPreferences() const { return _skeletonURLFromPreferences; }
+
+    const QString& getHeadModelName() const { return _headModelName; }
+    const QString& getBodyModelName() const { return _bodyModelName; }
+    const QString& getFullAvartarModelName() const { return _fullAvatarModelName; }
+
+    QString getModelDescription() const;
+
     virtual void setAttachmentData(const QVector<AttachmentData>& attachmentData);
 
     virtual glm::vec3 getSkeletonPosition() const;
@@ -185,6 +200,11 @@ protected:
     virtual void renderAttachments(RenderArgs::RenderMode renderMode, RenderArgs* args);
     
 private:
+
+    // These are made private for MyAvatar so that you will use the "use" methods instead
+    virtual void setFaceModelURL(const QUrl& faceModelURL);
+    virtual void setSkeletonModelURL(const QUrl& skeletonModelURL);
+
     float _turningKeyPressTime;
     glm::vec3 _gravity;
 
@@ -229,6 +249,16 @@ private:
     void updatePosition(float deltaTime);
     void updateCollisionSound(const glm::vec3& penetration, float deltaTime, float frequency);
     void maybeUpdateBillboard();
+    
+    // Avatar Preferences
+    bool _useFullAvatar = false;
+    QUrl _fullAvatarURLFromPreferences;
+    QUrl _headURLFromPreferences;
+    QUrl _skeletonURLFromPreferences;
+    
+    QString _headModelName;
+    QString _bodyModelName;
+    QString _fullAvatarModelName;
 };
 
 #endif // hifi_MyAvatar_h

interface/src/ui/AvatarAppearanceDialog.cpp

@@ -0,0 +1,210 @@
+//
+//  AvatarAppearanceDialog.cpp
+//  interface/src/ui
+//
+//  Created by Stojce Slavkovski on 2/20/14.
+//  Copyright 2014 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include <QFileDialog>
+#include <QFont>
+
+#include <AudioClient.h>
+#include <avatar/AvatarManager.h>
+#include <devices/Faceshift.h>
+#include <devices/SixenseManager.h>
+#include <NetworkingConstants.h>
+
+#include "Application.h"
+#include "MainWindow.h"
+#include "LODManager.h"
+#include "Menu.h"
+#include "AvatarAppearanceDialog.h"
+#include "Snapshot.h"
+#include "UserActivityLogger.h"
+#include "UIUtil.h"
+#include "ui/DialogsManager.h"
+#include "ui/PreferencesDialog.h"
+
+AvatarAppearanceDialog::AvatarAppearanceDialog(QWidget* parent) :
+    QDialog(parent) {
+        
+    setAttribute(Qt::WA_DeleteOnClose);
+
+    ui.setupUi(this);
+
+    loadAvatarAppearance();
+
+    connect(ui.defaultButton, &QPushButton::clicked, this, &AvatarAppearanceDialog::accept);
+
+    connect(ui.buttonBrowseHead, &QPushButton::clicked, this, &AvatarAppearanceDialog::openHeadModelBrowser);
+    connect(ui.buttonBrowseBody, &QPushButton::clicked, this, &AvatarAppearanceDialog::openBodyModelBrowser);
+    connect(ui.buttonBrowseFullAvatar, &QPushButton::clicked, this, &AvatarAppearanceDialog::openFullAvatarModelBrowser);
+
+    connect(ui.useSeparateBodyAndHead, &QRadioButton::clicked, this, &AvatarAppearanceDialog::useSeparateBodyAndHead);
+    connect(ui.useFullAvatar, &QRadioButton::clicked, this, &AvatarAppearanceDialog::useFullAvatar);
+    
+    connect(Application::getInstance(), &Application::headURLChanged, this, &AvatarAppearanceDialog::headURLChanged);
+    connect(Application::getInstance(), &Application::bodyURLChanged, this, &AvatarAppearanceDialog::bodyURLChanged);
+    connect(Application::getInstance(), &Application::fullAvatarURLChanged, this, &AvatarAppearanceDialog::fullAvatarURLChanged);
+
+    auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
+    
+    ui.bodyNameLabel->setText("Body - " + myAvatar->getBodyModelName());
+    ui.headNameLabel->setText("Head - " + myAvatar->getHeadModelName());
+    ui.fullAvatarNameLabel->setText("Full Avatar - " + myAvatar->getFullAvartarModelName());
+
+    UIUtil::scaleWidgetFontSizes(this);
+}
+
+void AvatarAppearanceDialog::useSeparateBodyAndHead(bool checked) {
+    QUrl headURL(ui.faceURLEdit->text());
+    QUrl bodyURL(ui.skeletonURLEdit->text());
+    DependencyManager::get<AvatarManager>()->getMyAvatar()->useHeadAndBodyURLs(headURL, bodyURL);
+    setUseFullAvatar(!checked);
+}
+
+void AvatarAppearanceDialog::useFullAvatar(bool checked) {
+    QUrl fullAvatarURL(ui.fullAvatarURLEdit->text());
+    DependencyManager::get<AvatarManager>()->getMyAvatar()->useFullAvatarURL(fullAvatarURL);
+    setUseFullAvatar(checked);
+}
+
+void AvatarAppearanceDialog::setUseFullAvatar(bool useFullAvatar) {
+    _useFullAvatar = useFullAvatar;
+    ui.faceURLEdit->setEnabled(!_useFullAvatar);
+    ui.skeletonURLEdit->setEnabled(!_useFullAvatar);
+    ui.fullAvatarURLEdit->setEnabled(_useFullAvatar);
+    
+    ui.useFullAvatar->setChecked(_useFullAvatar);
+    ui.useSeparateBodyAndHead->setChecked(!_useFullAvatar);
+
+    DependencyManager::get<DialogsManager>()->getPreferencesDialog()->avatarDescriptionChanged();
+}
+
+void AvatarAppearanceDialog::headURLChanged(const QString& newValue, const QString& modelName) {
+    ui.faceURLEdit->setText(newValue);
+    setUseFullAvatar(false);
+    ui.headNameLabel->setText("Head - " + modelName);
+}
+
+void AvatarAppearanceDialog::bodyURLChanged(const QString& newValue, const QString& modelName) {
+    ui.skeletonURLEdit->setText(newValue);
+    setUseFullAvatar(false);
+    ui.bodyNameLabel->setText("Body - " + modelName);
+}
+
+void AvatarAppearanceDialog::fullAvatarURLChanged(const QString& newValue, const QString& modelName) {
+    ui.fullAvatarURLEdit->setText(newValue);
+    setUseFullAvatar(true);
+    ui.fullAvatarNameLabel->setText("Full Avatar - " + modelName);
+}
+
+void AvatarAppearanceDialog::accept() {
+    saveAvatarAppearance();
+
+    DependencyManager::get<DialogsManager>()->getPreferencesDialog()->avatarDescriptionChanged();
+
+    close();
+    delete _marketplaceWindow;
+    _marketplaceWindow = NULL;
+}
+
+void AvatarAppearanceDialog::setHeadUrl(QString modelUrl) {
+    ui.faceURLEdit->setText(modelUrl);
+}
+
+void AvatarAppearanceDialog::setSkeletonUrl(QString modelUrl) {
+    ui.skeletonURLEdit->setText(modelUrl);
+}
+
+void AvatarAppearanceDialog::openFullAvatarModelBrowser() {
+    auto MARKETPLACE_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/marketplace?category=avatars";
+    auto WIDTH = 900;
+    auto HEIGHT = 700;
+    if (!_marketplaceWindow) {
+        _marketplaceWindow = new WebWindowClass("Marketplace", MARKETPLACE_URL, WIDTH, HEIGHT, false);
+    }
+    _marketplaceWindow->setVisible(true);
+}
+
+void AvatarAppearanceDialog::openHeadModelBrowser() {
+    auto MARKETPLACE_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/marketplace?category=avatars";
+    auto WIDTH = 900;
+    auto HEIGHT = 700;
+    if (!_marketplaceWindow) {
+        _marketplaceWindow = new WebWindowClass("Marketplace", MARKETPLACE_URL, WIDTH, HEIGHT, false);
+    }
+    _marketplaceWindow->setVisible(true);
+}
+
+void AvatarAppearanceDialog::openBodyModelBrowser() {
+    auto MARKETPLACE_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/marketplace?category=avatars";
+    auto WIDTH = 900;
+    auto HEIGHT = 700;
+    if (!_marketplaceWindow) {
+        _marketplaceWindow = new WebWindowClass("Marketplace", MARKETPLACE_URL, WIDTH, HEIGHT, false);
+    }
+    _marketplaceWindow->setVisible(true);
+}
+
+void AvatarAppearanceDialog::resizeEvent(QResizeEvent *resizeEvent) {
+    
+    // keep buttons panel at the bottom
+    ui.buttonsPanel->setGeometry(0,
+                                 size().height() - ui.buttonsPanel->height(),
+                                 size().width(),
+                                 ui.buttonsPanel->height());
+    
+    // set width and height of srcollarea to match bottom panel and width
+    ui.scrollArea->setGeometry(ui.scrollArea->geometry().x(), ui.scrollArea->geometry().y(),
+                               size().width(),
+                               size().height() - ui.buttonsPanel->height() - ui.scrollArea->geometry().y());
+    
+}
+
+void AvatarAppearanceDialog::loadAvatarAppearance() {
+    
+    MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
+
+    _useFullAvatar = myAvatar->getUseFullAvatar();
+    _fullAvatarURLString = myAvatar->getFullAvatarURLFromPreferences().toString();
+    _headURLString = myAvatar->getHeadURLFromPreferences().toString();
+    _bodyURLString = myAvatar->getBodyURLFromPreferences().toString();
+
+    ui.fullAvatarURLEdit->setText(_fullAvatarURLString);
+    ui.faceURLEdit->setText(_headURLString);
+    ui.skeletonURLEdit->setText(_bodyURLString);
+    setUseFullAvatar(_useFullAvatar);
+}
+
+void AvatarAppearanceDialog::saveAvatarAppearance() {
+    
+    MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
+
+    QUrl headURL(ui.faceURLEdit->text());
+    QString headURLString = headURL.toString();
+
+    QUrl bodyURL(ui.skeletonURLEdit->text());
+    QString bodyURLString = bodyURL.toString();
+
+    QUrl fullAvatarURL(ui.fullAvatarURLEdit->text());
+    QString fullAvatarURLString = fullAvatarURL.toString();
+
+    bool somethingChanged = 
+        _useFullAvatar != myAvatar->getUseFullAvatar() ||
+        fullAvatarURLString != myAvatar->getFullAvatarURLFromPreferences().toString() ||
+        headURLString != myAvatar->getHeadURLFromPreferences().toString() ||
+        bodyURLString != myAvatar->getBodyURLFromPreferences().toString();
+        
+    if (somethingChanged) {
+        if (_useFullAvatar) {
+            myAvatar->useFullAvatarURL(fullAvatarURL);
+        } else {
+            myAvatar->useHeadAndBodyURLs(headURL, bodyURL);
+        }
+    }
+}

interface/src/ui/AvatarAppearanceDialog.h

@@ -0,0 +1,64 @@
+//
+//  AvatarAppearanceDialog.h
+//  interface/src/ui
+//
+//  Created by Stojce Slavkovski on 2/20/14.
+//  Copyright 2014 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_AvatarAppearanceDialog_h
+#define hifi_AvatarAppearanceDialog_h
+
+#include "ui_avatarAppearance.h"
+
+#include <QDialog>
+#include <QString>
+
+#include "scripting/WebWindowClass.h"
+
+class AvatarAppearanceDialog : public QDialog {
+    Q_OBJECT
+    
+public:
+    AvatarAppearanceDialog(QWidget* parent = nullptr);
+
+protected:
+    void resizeEvent(QResizeEvent* resizeEvent);
+
+private:
+    void loadAvatarAppearance();
+    void saveAvatarAppearance();
+    void openHeadModelBrowser();
+    void openBodyModelBrowser();
+    void openFullAvatarModelBrowser();
+    void setUseFullAvatar(bool useFullAvatar);
+
+    Ui_AvatarAppearanceDialog ui;
+
+    bool _useFullAvatar;
+    QString _headURLString;
+    QString _bodyURLString;
+    QString _fullAvatarURLString;
+    
+    
+    QString _displayNameString;
+    
+    WebWindowClass* _marketplaceWindow = NULL;
+
+private slots:
+    void accept();
+    void setHeadUrl(QString modelUrl);
+    void setSkeletonUrl(QString modelUrl);
+    void headURLChanged(const QString& newValue, const QString& modelName);
+    void bodyURLChanged(const QString& newValue, const QString& modelName);
+    void fullAvatarURLChanged(const QString& newValue, const QString& modelName);
+    void useSeparateBodyAndHead(bool checked);
+    void useFullAvatar(bool checked);
+    
+    
+};
+
+#endif // hifi_AvatarAppearanceDialog_h

interface/src/ui/DialogsManager.cpp

@@ -18,6 +18,7 @@
 #include "AddressBarDialog.h"
 #include "AnimationsDialog.h"
 #include "AttachmentsDialog.h"
+#include "AvatarAppearanceDialog.h"
 #include "BandwidthDialog.h"
 #include "CachesSizeDialog.h"
 #include "DiskCacheEditor.h"
@@ -85,6 +86,15 @@ void DialogsManager::editPreferences() {
     }
 }
 
+void DialogsManager::changeAvatarAppearance() {
+    if (!_avatarAppearanceDialog) {
+        maybeCreateDialog(_avatarAppearanceDialog);
+        _avatarAppearanceDialog->show();
+    } else {
+        _avatarAppearanceDialog->close();
+    }
+}
+
 void DialogsManager::editAttachments() {
     if (!_attachmentsDialog) {
         maybeCreateDialog(_attachmentsDialog);

interface/src/ui/DialogsManager.h

@@ -33,6 +33,7 @@ class OctreeStatsDialog;
 class PreferencesDialog;
 class ScriptEditorWindow;
 class QMessageBox;
+class AvatarAppearanceDialog;
 
 class DialogsManager : public QObject, public Dependency {
     Q_OBJECT
@@ -43,6 +44,7 @@ public:
     QPointer<HMDToolsDialog> getHMDToolsDialog() const { return _hmdToolsDialog; }
     QPointer<LodToolsDialog> getLodToolsDialog() const { return _lodToolsDialog; }
     QPointer<OctreeStatsDialog> getOctreeStatsDialog() const { return _octreeStatsDialog; }
+    QPointer<PreferencesDialog> getPreferencesDialog() const { return _preferencesDialog; }
     
 public slots:
     void toggleAddressBar();
@@ -59,6 +61,7 @@ public slots:
     void hmdTools(bool showTools);
     void showScriptEditor();
     void showIRCLink();
+    void changeAvatarAppearance();
 
 private slots:
     void toggleToolWindow();
@@ -94,6 +97,7 @@ private:
     QPointer<OctreeStatsDialog> _octreeStatsDialog;
     QPointer<PreferencesDialog> _preferencesDialog;
     QPointer<ScriptEditorWindow> _scriptEditor;
+    QPointer<AvatarAppearanceDialog> _avatarAppearanceDialog;
 };
 
 #endif // hifi_DialogsManager_h

interface/src/ui/PreferencesDialog.cpp

@@ -19,6 +19,7 @@
 #include <NetworkingConstants.h>
 
 #include "Application.h"
+#include "DialogsManager.h"
 #include "MainWindow.h"
 #include "LODManager.h"
 #include "Menu.h"
@@ -41,30 +42,40 @@ PreferencesDialog::PreferencesDialog(QWidget* parent) :
     ui.outputBufferSizeSpinner->setMinimum(MIN_AUDIO_OUTPUT_BUFFER_SIZE_FRAMES);
     ui.outputBufferSizeSpinner->setMaximum(MAX_AUDIO_OUTPUT_BUFFER_SIZE_FRAMES);
 
-    connect(ui.buttonBrowseHead, &QPushButton::clicked, this, &PreferencesDialog::openHeadModelBrowser);
-    connect(ui.buttonBrowseBody, &QPushButton::clicked, this, &PreferencesDialog::openBodyModelBrowser);
     connect(ui.buttonBrowseLocation, &QPushButton::clicked, this, &PreferencesDialog::openSnapshotLocationBrowser);
     connect(ui.buttonBrowseScriptsLocation, &QPushButton::clicked, this, &PreferencesDialog::openScriptsLocationBrowser);
-    connect(ui.buttonReloadDefaultScripts, &QPushButton::clicked,
+    connect(ui.buttonReloadDefaultScripts, &QPushButton::clicked, Application::getInstance(), &Application::loadDefaultScripts);
-            Application::getInstance(), &Application::loadDefaultScripts);
 
+    DialogsManager* dialogsManager = DependencyManager::get<DialogsManager>().data();
+    connect(ui.buttonChangeApperance, &QPushButton::clicked, dialogsManager, &DialogsManager::changeAvatarAppearance);
 
-    connect(Application::getInstance(), &Application::faceURLChanged, this, &PreferencesDialog::faceURLChanged);
+    connect(Application::getInstance(), &Application::headURLChanged, this, &PreferencesDialog::headURLChanged);
-    connect(Application::getInstance(), &Application::skeletonURLChanged, this, &PreferencesDialog::skeletonURLChanged);
+    connect(Application::getInstance(), &Application::bodyURLChanged, this, &PreferencesDialog::bodyURLChanged);
+    connect(Application::getInstance(), &Application::fullAvatarURLChanged, this, &PreferencesDialog::fullAvatarURLChanged);
 
     // move dialog to left side
     move(parentWidget()->geometry().topLeft());
     setFixedHeight(parentWidget()->size().height() - PREFERENCES_HEIGHT_PADDING);
 
+    ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription());
+
     UIUtil::scaleWidgetFontSizes(this);
 }
 
-void PreferencesDialog::faceURLChanged(const QString& newValue) {
+void PreferencesDialog::avatarDescriptionChanged() {
-    ui.faceURLEdit->setText(newValue);
+    ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription());
 }
 
-void PreferencesDialog::skeletonURLChanged(const QString& newValue) {
+void PreferencesDialog::headURLChanged(const QString& newValue, const QString& modelName) {
-    ui.skeletonURLEdit->setText(newValue);
+    ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription());
+}
+
+void PreferencesDialog::bodyURLChanged(const QString& newValue, const QString& modelName) {
+    ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription());
+}
+
+void PreferencesDialog::fullAvatarURLChanged(const QString& newValue, const QString& modelName) {
+    ui.apperanceDescription->setText(DependencyManager::get<AvatarManager>()->getMyAvatar()->getModelDescription());
 }
 
 void PreferencesDialog::accept() {
@@ -74,34 +85,6 @@ void PreferencesDialog::accept() {
     _marketplaceWindow = NULL;
 }
 
-void PreferencesDialog::setHeadUrl(QString modelUrl) {
-    ui.faceURLEdit->setText(modelUrl);
-}
-
-void PreferencesDialog::setSkeletonUrl(QString modelUrl) {
-    ui.skeletonURLEdit->setText(modelUrl);
-}
-
-void PreferencesDialog::openHeadModelBrowser() {
-    auto MARKETPLACE_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/marketplace?category=avatars";
-    auto WIDTH = 900;
-    auto HEIGHT = 700;
-    if (!_marketplaceWindow) {
-        _marketplaceWindow = new WebWindowClass("Marketplace", MARKETPLACE_URL, WIDTH, HEIGHT, false);
-    }
-    _marketplaceWindow->setVisible(true);
-}
-
-void PreferencesDialog::openBodyModelBrowser() {
-    auto MARKETPLACE_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/marketplace?category=avatars";
-    auto WIDTH = 900;
-    auto HEIGHT = 700;
-    if (!_marketplaceWindow) {
-        _marketplaceWindow = new WebWindowClass("Marketplace", MARKETPLACE_URL, WIDTH, HEIGHT, false);
-    }
-    _marketplaceWindow->setVisible(true);
-}
-
 void PreferencesDialog::openSnapshotLocationBrowser() {
     QString dir = QFileDialog::getExistingDirectory(this, tr("Snapshots Location"),
                                                     QStandardPaths::writableLocation(QStandardPaths::DesktopLocation),
@@ -143,12 +126,6 @@ void PreferencesDialog::loadPreferences() {
     _displayNameString = myAvatar->getDisplayName();
     ui.displayNameEdit->setText(_displayNameString);
 
-    _faceURLString = myAvatar->getHead()->getFaceModel().getURL().toString();
-    ui.faceURLEdit->setText(_faceURLString);
-
-    _skeletonURLString = myAvatar->getSkeletonModel().getURL().toString();
-    ui.skeletonURLEdit->setText(_skeletonURLString);
-    
     ui.sendDataCheckBox->setChecked(!menuInstance->isOptionChecked(MenuOption::DisableActivityLogger));
 
     ui.snapshotLocationEdit->setText(Snapshot::snapshotsLocation.get());
@@ -208,6 +185,7 @@ void PreferencesDialog::loadPreferences() {
 void PreferencesDialog::savePreferences() {
     
     MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
+
     bool shouldDispatchIdentityPacket = false;
     
     QString displayNameStr(ui.displayNameEdit->text());
@@ -217,34 +195,6 @@ void PreferencesDialog::savePreferences() {
         shouldDispatchIdentityPacket = true;
     }
 
-    auto AVATAR_FILE_EXTENSION = ".fst";
-    
-    QUrl faceModelURL(ui.faceURLEdit->text());
-    QString faceModelURLString = faceModelURL.toString();
-    if (faceModelURLString != _faceURLString) {
-        if (faceModelURLString.isEmpty() || faceModelURLString.toLower().contains(AVATAR_FILE_EXTENSION)) {
-            // change the faceModelURL in the profile, it will also update this user's BlendFace
-            myAvatar->setFaceModelURL(faceModelURL);
-            UserActivityLogger::getInstance().changedModel("head", faceModelURLString);
-            shouldDispatchIdentityPacket = true;
-        } else {
-            qDebug() << "ERROR: Head model not FST or blank - " << faceModelURLString;
-        }
-    }
-
-    QUrl skeletonModelURL(ui.skeletonURLEdit->text());
-    QString skeletonModelURLString = skeletonModelURL.toString();
-    if (skeletonModelURLString != _skeletonURLString) {
-        if (skeletonModelURLString.isEmpty() || skeletonModelURLString.toLower().contains(AVATAR_FILE_EXTENSION)) {
-            // change the skeletonModelURL in the profile, it will also update this user's Body
-            myAvatar->setSkeletonModelURL(skeletonModelURL);
-            UserActivityLogger::getInstance().changedModel("skeleton", skeletonModelURLString);
-            shouldDispatchIdentityPacket = true;
-        } else {
-            qDebug() << "ERROR: Skeleton model not FST or blank - " << skeletonModelURLString;
-        }
-    }
-    
     if (shouldDispatchIdentityPacket) {
         myAvatar->sendIdentityPacket();
     }

interface/src/ui/PreferencesDialog.h

@@ -25,31 +25,28 @@ class PreferencesDialog : public QDialog {
 public:
     PreferencesDialog(QWidget* parent = nullptr);
 
+    void avatarDescriptionChanged();
+
 protected:
     void resizeEvent(QResizeEvent* resizeEvent);
 
 private:
     void loadPreferences();
     void savePreferences();
-    void openHeadModelBrowser();
-    void openBodyModelBrowser();
 
     Ui_PreferencesDialog ui;
-    QString _faceURLString;
+
-    QString _skeletonURLString;
     QString _displayNameString;
     
     WebWindowClass* _marketplaceWindow = NULL;
 
 private slots:
     void accept();
-    void setHeadUrl(QString modelUrl);
-    void setSkeletonUrl(QString modelUrl);
     void openSnapshotLocationBrowser();
     void openScriptsLocationBrowser();
-    void faceURLChanged(const QString& newValue);
+    void headURLChanged(const QString& newValue, const QString& modelName);
-    void skeletonURLChanged(const QString& newValue);
+    void bodyURLChanged(const QString& newValue, const QString& modelName);
-    
+    void fullAvatarURLChanged(const QString& newValue, const QString& modelName);
 };
 
 #endif // hifi_PreferencesDialog_h

interface/ui/avatarAppearance.ui

@@ -0,0 +1,471 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AvatarAppearanceDialog</class>
+ <widget class="QDialog" name="AvatarAppearanceDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>500</width>
+    <height>350</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>500</width>
+    <height>350</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>500</width>
+    <height>16777215</height>
+   </size>
+  </property>
+  <property name="font">
+   <font>
+    <pointsize>13</pointsize>
+   </font>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Plain</enum>
+     </property>
+     <property name="lineWidth">
+      <number>0</number>
+     </property>
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>-107</y>
+        <width>485</width>
+        <height>1550</height>
+       </rect>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="leftMargin">
+        <number>30</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>30</number>
+       </property>
+       <property name="bottomMargin">
+        <number>10</number>
+       </property>
+
+       
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_4">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>7</number>
+         </property>
+         <property name="bottomMargin">
+          <number>7</number>
+         </property>
+         
+         
+         
+       <item>
+        <widget class="QRadioButton" name="useFullAvatar">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="text">
+          <string>Use single avatar with Body and Head</string>
+         </property>
+        </widget>
+       </item>
+
+
+
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_fullAvatar">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="leftMargin">
+          <number>10</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         
+         
+         <item>
+          <widget class="QLabel" name="fullAvatarNameLabel">
+           <property name="font">
+            <font>
+             <family>Arial</family>
+            </font>
+           </property>
+           <property name="text">
+            <string>Full Avatar</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+           </property>
+           <property name="buddy">
+            <cstring>fullAvatarURLEdit</cstring>
+           </property>
+          </widget>
+         </item>
+
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_fullAvatar">
+
+           <item>
+            <widget class="QLineEdit" name="fullAvatarURLEdit">
+             <property name="minimumSize">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+
+           <item>
+            <spacer name="horizontalSpacer_fullAvatar">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Fixed</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>5</width>
+               <height>0</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+
+           <item>
+            <widget class="QPushButton" name="buttonBrowseFullAvatar">
+             <property name="font">
+              <font>
+               <family>Arial</family>
+              </font>
+             </property>
+             <property name="text">
+              <string>Browse</string>
+             </property>
+             <property name="iconSize">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+           
+           
+           
+          </layout>
+         </item>
+         
+         
+         
+        </layout>
+        
+        
+        
+        
+       </item>
+
+       <item>
+        <widget class="QRadioButton" name="useSeparateBodyAndHead">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="text">
+          <string>Use separate Body and Head avatar files</string>
+         </property>
+        </widget>
+       </item>
+
+
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_separateParts_head">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="leftMargin">
+          <number>10</number>
+         </property>
+         <property name="topMargin">
+          <number>7</number>
+         </property>
+         <property name="bottomMargin">
+          <number>7</number>
+         </property>
+
+
+
+         <item>
+          <widget class="QLabel" name="headNameLabel">
+           <property name="font">
+            <font>
+             <family>Arial</family>
+            </font>
+           </property>
+           <property name="text">
+            <string>Head</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+           </property>
+          </widget>
+
+         </item>
+         
+         
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout">
+           <property name="spacing">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QLineEdit" name="faceURLEdit"/>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Fixed</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>5</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QPushButton" name="buttonBrowseHead">
+             <property name="font">
+              <font>
+               <family>Arial</family>
+              </font>
+             </property>
+             <property name="text">
+              <string>Browse</string>
+             </property>
+             <property name="iconSize">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         
+         
+        </layout>
+       </item>
+
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_separateParts_body">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="leftMargin">
+          <number>10</number>
+         </property>
+         <property name="topMargin">
+          <number>7</number>
+         </property>
+         <property name="bottomMargin">
+          <number>7</number>
+         </property>
+         
+         <item>
+          <widget class="QLabel" name="bodyNameLabel">
+           <property name="font">
+            <font>
+             <family>Arial</family>
+            </font>
+           </property>
+           <property name="text">
+            <string>Body</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+           </property>
+           <property name="buddy">
+            <cstring>skeletonURLEdit</cstring>
+           </property>
+          </widget>
+
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_skeletonURL">
+           <property name="spacing">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QLineEdit" name="skeletonURLEdit">
+             <property name="minimumSize">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_10">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Fixed</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>5</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QPushButton" name="buttonBrowseBody">
+             <property name="font">
+              <font>
+               <family>Arial</family>
+              </font>
+             </property>
+             <property name="text">
+              <string>Browse</string>
+             </property>
+             <property name="iconSize">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+
+
+
+
+        </layout>
+       </item>
+
+
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QFrame" name="buttonsPanel">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_12">
+      <item>
+       <layout class="QHBoxLayout" name="buttonsHBox_2">
+        <item>
+         <spacer name="horizontalSpacer_14">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="defaultButton">
+          <property name="font">
+           <font>
+            <family>Arial</family>
+           </font>
+          </property>
+          <property name="text">
+           <string>Close</string>
+          </property>
+          <property name="default">
+           <bool>true</bool>
+          </property>
+          <property name="flat">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+</ui>

interface/ui/preferencesDialog.ui

@@ -128,6 +128,8 @@
          </property>
         </widget>
        </item>
+
+
        <item>
         <layout class="QVBoxLayout" name="verticalLayout_5">
          <property name="spacing">
@@ -187,8 +189,9 @@
          </item>
         </layout>
        </item>
+       
        <item>
-        <layout class="QVBoxLayout" name="verticalLayout_4">
+        <layout class="QVBoxLayout" name="verticalLayout_appearance">
          <property name="spacing">
           <number>0</number>
          </property>
@@ -199,33 +202,47 @@
           <number>7</number>
          </property>
          <item>
-          <widget class="QLabel" name="headLabel">
+          <widget class="QLabel" name="appearanceLabel">
            <property name="font">
             <font>
              <family>Arial</family>
             </font>
            </property>
            <property name="text">
-            <string>Head</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Appearance&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
            </property>
            <property name="buddy">
-            <cstring>snapshotLocationEdit</cstring>
+            <cstring>apperanceDescription</cstring>
            </property>
           </widget>
          </item>
+
+
+
          <item>
-          <layout class="QHBoxLayout" name="horizontalLayout">
+          <layout class="QHBoxLayout" name="horizontalLayout_1_apperanceDescription">
            <property name="spacing">
             <number>0</number>
            </property>
            <item>
-            <widget class="QLineEdit" name="faceURLEdit"/>
+            <widget class="QLineEdit" name="apperanceDescription">
+             <property name="font">
+              <font>
+               <family>Arial</family>
+              </font>
+             </property>
+
+             <property name="enabled">
+               <bool>false</bool>
+             </property>
+             
+            </widget>
            </item>
            <item>
-            <spacer name="horizontalSpacer">
+            <spacer name="horizontalSpacer_1_apperanceDescription">
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
@@ -241,96 +258,14 @@
             </spacer>
            </item>
            <item>
-            <widget class="QPushButton" name="buttonBrowseHead">
+            <widget class="QPushButton" name="buttonChangeApperance">
              <property name="font">
               <font>
                <family>Arial</family>
               </font>
              </property>
              <property name="text">
-              <string>Browse</string>
+              <string>Change</string>
-             </property>
-             <property name="iconSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_3">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>7</number>
-         </property>
-         <property name="bottomMargin">
-          <number>7</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="headLabel_2">
-           <property name="font">
-            <font>
-             <family>Arial</family>
-            </font>
-           </property>
-           <property name="text">
-            <string>Body</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-           </property>
-           <property name="buddy">
-            <cstring>skeletonURLEdit</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_7">
-           <property name="spacing">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLineEdit" name="skeletonURLEdit">
-             <property name="minimumSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="horizontalSpacer_10">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeType">
-              <enum>QSizePolicy::Fixed</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>5</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QPushButton" name="buttonBrowseBody">
-             <property name="font">
-              <font>
-               <family>Arial</family>
-              </font>
-             </property>
-             <property name="text">
-              <string>Browse</string>
              </property>
              <property name="iconSize">
               <size>
@@ -342,8 +277,11 @@
            </item>
           </layout>
          </item>
+
         </layout>
        </item>
+              
+       
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">
@@ -413,6 +351,7 @@
            </property>
           </widget>
          </item>
+         
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_1">
            <property name="spacing">
@@ -463,6 +402,10 @@
            </item>
           </layout>
          </item>
+         
+         
+         
+         
         </layout>
        </item>
        <item>
@@ -665,6 +608,7 @@
          </property>
         </widget>
        </item>
+
        <item>
         <widget class="QCheckBox" name="sendDataCheckBox">
          <property name="sizePolicy">

libraries/avatars/src/AvatarData.h

@@ -103,6 +103,8 @@ const int AVATAR_BILLBOARD_PACKET_SEND_INTERVAL_MSECS = 5000;
 
 const QUrl DEFAULT_HEAD_MODEL_URL = QUrl("http://public.highfidelity.io/models/heads/defaultAvatar_head.fst");
 const QUrl DEFAULT_BODY_MODEL_URL = QUrl("http://public.highfidelity.io/models/skeletons/defaultAvatar_body.fst");
+const QUrl DEFAULT_FULL_AVATAR_MODEL_URL = QUrl("http://public.highfidelity.io/marketplace/contents/029db3d4-da2c-4cb2-9c08-b9612ba576f5/02949063e7c4aed42ad9d1a58461f56d.fst");
+
 
 // Where one's own Avatar begins in the world (will be overwritten if avatar data file is found).
 // This is the start location in the Sandbox (xyz: 6270, 211, 6000).

libraries/fbx/src/FSTReader.cpp

@@ -10,6 +10,13 @@
 //
 
 #include <QBuffer>
+#include <QEventLoop>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+
+#include <NetworkAccessManager.h>
+#include <NetworkingConstants.h>
+#include <SharedUtil.h>
 
 #include "FSTReader.h"
 
@@ -169,3 +176,17 @@ FSTReader::ModelType FSTReader::predictModelType(const QVariantHash& mapping) {
     
     return ENTITY_MODEL;
 }
+
+QVariantHash FSTReader::downloadMapping(const QString& url) {
+    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+    QNetworkRequest networkRequest = QNetworkRequest(url);
+    networkRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
+    QNetworkReply* reply = networkAccessManager.get(networkRequest);
+    qDebug() << "Downloading avatar file at " << url;
+    QEventLoop loop;
+    QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
+    loop.exec();
+    QByteArray fstContents = reply->readAll();
+    delete reply;
+    return FSTReader::readMapping(fstContents);
+}

libraries/fbx/src/FSTReader.h

@@ -51,6 +51,7 @@ public:
 
     static QString getNameFromType(ModelType modelType);
     static FSTReader::ModelType getTypeFromName(const QString& name);
+    static QVariantHash downloadMapping(const QString& url);
 
 private:
     static void writeVariant(QBuffer& buffer, QVariantHash::const_iterator& it);