Allow 'include' attribute on root PropertyList element.

diff --git a/simgear/misc/props_io.cxx b/simgear/misc/props_io.cxx
index 45f8829665f7d5f85b69d122066e0b5800dba413..15c522be3a6019b57443177dc540e4cd9d247109 100644 (file)
--- a/simgear/misc/props_io.cxx
+++ b/simgear/misc/props_io.cxx
@@ -140,6 +140,7 @@ void
 PropsVisitor::startElement (const char * name, const XMLAttributes &atts)
 {
   State &st = state();
+  const char * attval;
 
   if (_level == 0) {
     if (string(name) != (string)"PropertyList") {
@@ -148,12 +149,23 @@ PropsVisitor::startElement (const char * name, const XMLAttributes &atts)
       message += "; expected PropertyList";
       throw sg_io_exception(message, "SimGear Property Reader");
     }
+
+                               // Check for an include.
+    attval = atts.getValue("include");
+    if (attval != 0) {
+      SGPath path(SGPath(_base).dir());
+      path.append(attval);
+      try {
+       readProperties(path.str(), _root);
+      } catch (sg_io_exception &e) {
+       setException(e);
+      }
+    }
+
     push_state(_root, "", DEFAULT_MODE);
   }
 
   else {
-
-    const char * attval;
                                // Get the index.
     attval = atts.getValue("n");
     int index = 0;