From 592d0dfc5b3ac86475509f57916960475652b590 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 13 Nov 2007 17:03:36 +0000
Subject: [PATCH] Added support for filename only setup of CompositeLayer on
 reading/writing.

---
 src/osgPlugins/osgTerrain/Terrain.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/osgPlugins/osgTerrain/Terrain.cpp b/src/osgPlugins/osgTerrain/Terrain.cpp
index f6a735794..2503792bd 100644
--- a/src/osgPlugins/osgTerrain/Terrain.cpp
+++ b/src/osgPlugins/osgTerrain/Terrain.cpp
@@ -189,8 +189,19 @@ osgTerrain::Layer* readLayer(osgDB::Input& fr, bool& itrAdvanced)
         {
             osg::notify(osg::INFO)<<"Composite layer "<<fr[0].getStr()<<std::endl;
             bool localAdvanced = false;
-            osgTerrain::Layer* layer = readLayer(fr, localAdvanced);
-            if (layer) cl->addLayer(layer);
+            
+            if (fr.matchSequence("file %s") || fr.matchSequence("file %w") )
+            {
+                cl->addLayer(fr[1].getStr());
+                fr += 2;
+                localAdvanced = true;
+            }
+            else
+            {
+                osgTerrain::Layer* layer = readLayer(fr, localAdvanced);
+                if (layer) cl->addLayer(layer);
+            }
+            
             if (!localAdvanced) ++fr;
 
         }
@@ -567,7 +578,7 @@ bool writeLayer(const osgTerrain::Layer& layer, osgDB::Output& fw)
             }
             else if (!compositeLayer->getFileName(i).empty())
             {
-                fw.indent()<<"image "<<compositeLayer->getFileName(i)<<std::endl;
+                fw.indent()<<"file "<<compositeLayer->getFileName(i)<<std::endl;
             }
         }
         fw.moveOut();