From 3e90bcd523f0519adb9436c38ed4bb4d914ee3c6 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 10 Feb 2014 11:28:22 -0800
Subject: [PATCH] use shorter default URLs, set as placeholder text in prefs

---
 interface/src/Menu.cpp               | 2 ++
 interface/src/avatar/MyAvatar.cpp    | 2 +-
 libraries/avatars/src/AvatarData.cpp | 4 ----
 libraries/avatars/src/AvatarData.h   | 3 +++
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index af41e583b9..e7f6120d52 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -774,11 +774,13 @@ void Menu::editPreferences() {
     QString faceURLString = applicationInstance->getAvatar()->getHead().getFaceModel().getURL().toString();
     QLineEdit* faceURLEdit = new QLineEdit(faceURLString);
     faceURLEdit->setMinimumWidth(QLINE_MINIMUM_WIDTH);
+    faceURLEdit->setPlaceholderText(DEFAULT_HEAD_MODEL_URL.toString());
     form->addRow("Face URL:", faceURLEdit);
 
     QString skeletonURLString = applicationInstance->getAvatar()->getSkeletonModel().getURL().toString();
     QLineEdit* skeletonURLEdit = new QLineEdit(skeletonURLString);
     skeletonURLEdit->setMinimumWidth(QLINE_MINIMUM_WIDTH);
+    skeletonURLEdit->setPlaceholderText(DEFAULT_BODY_MODEL_URL.toString());
     form->addRow("Skeleton URL:", skeletonURLEdit);
 
     QSlider* pupilDilation = new QSlider(Qt::Horizontal);
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 87d825e6e5..98eb9a4431 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -637,7 +637,7 @@ void MyAvatar::loadData(QSettings* settings) {
     Application::getInstance()->getCamera()->setScale(_scale);
     
     setFaceModelURL(settings->value("faceModelURL").toUrl());
-    setSkeletonModelURL(settings->value("faceModelURL").toUrl());
+    setSkeletonModelURL(settings->value("skeletonModelURL").toUrl());
 
     settings->endGroup();
 }
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index a3f1897a04..8981f78023 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -300,16 +300,12 @@ QByteArray AvatarData::identityByteArray() {
     return identityData;
 }
 
-const QUrl DEFAULT_HEAD_MODEL_URL = QUrl("https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/defaultAvatar_head.fbx");
-
 void AvatarData::setFaceModelURL(const QUrl& faceModelURL) {
     _faceModelURL = faceModelURL.isEmpty() ? DEFAULT_HEAD_MODEL_URL : faceModelURL;
     
     qDebug() << "Changing face model for avatar to" << _faceModelURL.toString();
 }
 
-const QUrl DEFAULT_BODY_MODEL_URL = QUrl("https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/defaultAvatar_body.fbx");
-
 void AvatarData::setSkeletonModelURL(const QUrl& skeletonModelURL) {
     _skeletonModelURL = skeletonModelURL.isEmpty() ? DEFAULT_BODY_MODEL_URL : skeletonModelURL;
     
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 5c3c9ad9af..43db344899 100755
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -52,6 +52,9 @@ static const float MIN_AVATAR_SCALE = .005f;
 
 const float MAX_AUDIO_LOUDNESS = 1000.0; // close enough for mouth animation
 
+const QUrl DEFAULT_HEAD_MODEL_URL = QUrl("http://public.highfidelity.io/meshes/defaultAvatar_head.fbx");
+const QUrl DEFAULT_BODY_MODEL_URL = QUrl("http://public.highfidelity.io/meshes/defaultAvatar_body.fbx");
+
 enum KeyState {
     NO_KEY_DOWN = 0,
     INSERT_KEY_DOWN,