From 27d338e81c2c689c958cc554820023324fd71070 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 11 Feb 2016 15:49:13 -0800
Subject: [PATCH] make any asset path relative to assets dir

---
 assignment-client/src/assets/AssetServer.cpp   | 2 +-
 domain-server/resources/describe-settings.json | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp
index 34cd97eca6..4ca2439996 100644
--- a/assignment-client/src/assets/AssetServer.cpp
+++ b/assignment-client/src/assets/AssetServer.cpp
@@ -89,7 +89,7 @@ void AssetServer::completeSetup() {
     if (assetsPath.isRelative()) {
         // if the domain settings passed us a relative path, make an absolute path that is relative to the
         // default data directory
-        absoluteFilePath = ServerPathUtils::getDataFilePath(assetsPathString);
+        absoluteFilePath = ServerPathUtils::getDataFilePath("assets/" + assetsPathString);
     }
 
     _resourcesDirectory = QDir(absoluteFilePath);
diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 760b0f7c40..014d9f3767 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -184,8 +184,7 @@
           "type": "string",
           "label": "Assets Path",
           "help": "The path to the directory assets are stored in.<br/>If this path is relative, it will be relative to the application data directory.<br/>If you change this path you will need to manually copy any existing assets from the previous directory.",
-          "placeholder": "assets",
-          "default": "assets",
+          "default": "",
           "advanced": true
         }
       ]