From 4a456488a1dede351aaf1c43312f025134ad076a Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 17 Aug 2015 14:01:25 -0700
Subject: [PATCH] remove the option to persist entities as anything other than
 json.gz files

---
 assignment-client/src/octree/OctreeServer.cpp |  7 +----
 .../resources/describe-settings.json          | 26 ++-----------------
 2 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp
index 76d701f0e3..062fe39dbd 100644
--- a/assignment-client/src/octree/OctreeServer.cpp
+++ b/assignment-client/src/octree/OctreeServer.cpp
@@ -971,12 +971,7 @@ void OctreeServer::readConfiguration() {
         strcpy(_persistFilename, qPrintable(persistFilename));
         qDebug("persistFilename=%s", _persistFilename);
 
-        QString persistAsFileType;
-        if (!readOptionString(QString("persistAsFileType"), settingsSectionObject, persistAsFileType)) {
-            persistAsFileType = "svo";
-        }
-        _persistAsFileType = persistAsFileType;
-        qDebug() << "persistAsFileType=" << _persistAsFileType;
+        _persistAsFileType = "json.gz";
 
         _persistInterval = OctreePersistThread::DEFAULT_PERSIST_INTERVAL;
         readOptionInt(QString("persistInterval"), settingsSectionObject, _persistInterval);
diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 696a87d2b8..b04ea95a23 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -371,30 +371,8 @@
           "name": "persistFilename",
           "label": "Entities Filename",
           "help": "the path to the file entities are stored in. Make sure the path exists.",
-          "placeholder": "resources/models.svo",
-          "default": "resources/models.svo",
-          "advanced": true
-        },
-        {
-          "name": "persistAsFileType",
-          "label": "File format for entity server's persistent data",
-          "help": "This defines how the entity server will save entities to disk.",
-          "default": "svo",
-          "type": "select",
-          "options": [
-            {
-              "value": "svo",
-              "label": "Entity server persists data as SVO"
-            },
-            {
-              "value": "json",
-              "label": "Entity server persists data as JSON"
-            },
-            {
-              "value": "json.gz",
-              "label": "Entity server persists data as gzipped JSON"
-            }
-          ],
+          "placeholder": "resources/models.json.gz",
+          "default": "resources/models.json.gz",
           "advanced": true
         },
         {