commradio: improvements for atis speech

[flightgear.git] / src / Viewer / renderingpipeline.cxx

diff --git a/src/Viewer/renderingpipeline.cxx b/src/Viewer/renderingpipeline.cxx
index da9cd09a377ca2c026048241cd26ef73c29f96b8..1c0cb345d53207eedc16a3a0440680073165ac46 100644 (file)
--- a/src/Viewer/renderingpipeline.cxx
+++ b/src/Viewer/renderingpipeline.cxx
@@ -132,8 +132,8 @@ void findAttrOrHex(const simgear::effect::EffectPropertyMap<T>& pMap,
         try {
             result = boost::lexical_cast<T>(val);
         } catch (boost::bad_lexical_cast &) {
-            throw simgear::effect::BuilderException(string("findAttrOrHex: could not find attribute ")
-                                   + string(val));
+            throw simgear::effect::BuilderException(std::string("findAttrOrHex: could not find attribute ")
+                                                    + std::string(val));
         }
     }
 }
@@ -274,6 +274,7 @@ FGRenderingPipeline::Pass::Pass(SGPropertyNode* prop)
 
     orderNum = prop->getIntValue("order-num", -1);
     effect = prop->getStringValue("effect", "");
+    debugProperty = prop->getStringValue("debug-property", "");
 
     parseCondition(prop);
 }