address code review comments

domain-server/resources/web/content/index.shtml

@@ -16,20 +16,23 @@
         <form id="upload-form" action="upload" enctype="multipart/form-data" method="post">
           <div class="panel-body">
             <p>
-              Upload an entities file (e.g.: models.json.gz) to replace the content of this domain.</br>
+              Upload an entities file (e.g.: models.json.gz) to replace the content of this domain.<br>
               Note: <strong>Your domain's content will be replaced by the content you upload</strong>, but the backup files of your domain's content will not immediately be changed.
             </p>
             <p>
-              If your domain has any content that you would like to re-use at a later date, save a manual backup of your models.json.gz file, which is usually stored in <i>C:\Users\[user_name]\AppData\Roaming\High Fidelity\assignment-client</i>.
+              If your domain has any content that you would like to re-use at a later date, save a manual backup of your models.json.gz file, which is usually stored at the following paths:<br>
+              <pre>C:\Users\[username]\AppData\Roaming\High Fidelity\assignment-client/entities/models.json.gz</pre>
+              <pre>/Users/[username]/Library/Application Support/High Fidelity/assignment-client/entities/models.json.gz</pre>
+              <pre>/home/[username]/.local/share/High Fidelity/assignment-client/entities/models.json.gz</pre>
             </p>
-
+            <br>
             <input type="file" name="entities-file" class="form-control-file" accept=".json, .gz">
+            <br>
           </div>
           <div class="panel-footer">
             <input type="submit" class="btn btn-info" value="Upload">
           </div>
         </form>
-
       </div>
     </div>
   </div>

domain-server/src/DomainServer.cpp

@@ -2593,9 +2593,9 @@ void DomainServer::handleOctreeFileReplacement(QByteArray octreeFile) {
     // enumerate the nodes and find any octree type servers with active sockets
 
     auto limitedNodeList = DependencyManager::get<LimitedNodeList>();
-    limitedNodeList->eachMatchingNode([](const SharedNodePointer& node){
+    limitedNodeList->eachMatchingNode([](const SharedNodePointer& node) {
         return node->getType() == NodeType::EntityServer && node->getActiveSocket();
-    }, [&octreeFile, limitedNodeList](const SharedNodePointer& octreeNode){
+    }, [&octreeFile, limitedNodeList](const SharedNodePointer& octreeNode) {
         // setup a packet to send to this octree server with the new octree file data
         auto octreeFilePacketList = NLPacketList::create(PacketType::OctreeFileReplacement, QByteArray(), true, true);
         octreeFilePacketList->write(octreeFile);

interface/src/Application.cpp

@@ -5177,7 +5177,6 @@ void Application::clearDomainOctreeDetails() {
     qCDebug(interfaceapp) << "Clearing domain octree details...";
 
     resetPhysicsReadyInformation();
-    getMyAvatar()->setAvatarEntityDataChanged(true); // to recreate worn entities
 
     // reset our node to stats and node to jurisdiction maps... since these must be changing...
     _entityServerJurisdictions.withWriteLock([&] {
@@ -5204,6 +5203,7 @@ void Application::clearDomainOctreeDetails() {
 }
 
 void Application::clearDomainAvatars() {
+    getMyAvatar()->setAvatarEntityDataChanged(true); // to recreate worn entities
     DependencyManager::get<AvatarManager>()->clearOtherAvatars();
 }
 

libraries/octree/src/OctreePersistThread.cpp

@@ -152,9 +152,10 @@ void OctreePersistThread::possiblyReplaceContent() {
             } else {
                 qWarning() << "Could not backup previous models file to" << backupFileName << "- removing replacement models file";
 
-                if (!QFile::remove(replacementFileName)) {
+                if (!replacementFile.remove()) {
                     qWarning() << "Could not remove replacement models file from" << replacementFileName
                         << "- replacement will be re-attempted on next server restart";
+                    return;
                 }
             }
         }