From ed4bd41574450e892249570523bb2cc098e52aa8 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 10 Sep 2008 16:17:17 +0000
Subject: [PATCH] Removed unneccessary compound name usage

---
 src/osgPlugins/osgTerrain/ImageLayer.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/osgPlugins/osgTerrain/ImageLayer.cpp b/src/osgPlugins/osgTerrain/ImageLayer.cpp
index 85438085a..6ae125241 100644
--- a/src/osgPlugins/osgTerrain/ImageLayer.cpp
+++ b/src/osgPlugins/osgTerrain/ImageLayer.cpp
@@ -33,15 +33,12 @@ bool ImageLayer_readLocalData(osg::Object& obj, osgDB::Input &fr)
     
     if (fr.matchSequence("file %w") || fr.matchSequence("file %s"))
     {
-        std::string setname;
-        std::string filename;
-        osgTerrain::extractSetNameAndFileName(fr[1].getStr(),setname, filename);
+        std::string filename = fr[1].getStr();
         if (!filename.empty())
         {
             osg::ref_ptr<osg::Image> image = fr.readImage(filename.c_str());
             if (image.valid())
             {
-                layer.setName(setname);
                 layer.setFileName(filename);
                 layer.setImage(image.get());
             }
@@ -61,8 +58,7 @@ bool ImageLayer_writeLocalData(const osg::Object& obj, osgDB::Output& fw)
     
     if (!layer.getFileName().empty())
     {
-        std::string str = osgTerrain::createCompondSetNameAndFileName(layer.getName(), layer.getFileName());
-        fw.indent()<<"file "<< str << std::endl;
+        fw.indent()<<"file "<< layer.getFileName() << std::endl;
     }
 
     return true;