SG part of fix for TerraSync models.

Ensure we search the TerraSync models tree before the FG_ROOT one,
since the TerraSync one contains newer files and updates to the base
one.

diff --git a/simgear/scene/tgdb/ReaderWriterSTG.cxx b/simgear/scene/tgdb/ReaderWriterSTG.cxx
index 4451206873a646446770d49225c225b83c3baf14..74224d4d13b4c7508d5c89375f877f50eec858a9 100644 (file)
--- a/simgear/scene/tgdb/ReaderWriterSTG.cxx
+++ b/simgear/scene/tgdb/ReaderWriterSTG.cxx
@@ -185,6 +185,14 @@ struct ReaderWriterSTG::_ModelBin {
         SGPath path = filePath;
         path.append(".."); path.append(".."); path.append("..");
         sharedOptions->getDatabasePathList().push_back(path.str());
+        
+        // ensure Models directory synced via TerraSync is searched before the copy in
+        // FG_ROOT, so that updated models can be used.
+        std::string terrasync_root = options->getPluginStringData("SimGear::TERRASYNC_ROOT");
+        if (!terrasync_root.empty()) {
+            sharedOptions->getDatabasePathList().push_back(terrasync_root);
+        }
+        
         std::string fg_root = options->getPluginStringData("SimGear::FG_ROOT");
         sharedOptions->getDatabasePathList().push_back(fg_root);