From: ThorstenB Date: Tue, 7 Feb 2012 20:12:51 +0000 (+0100) Subject: Fix another line lost in a merge conflict. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=17590ba4369bd1bdd979bf046e373f7127dabaf2;p=flightgear.git Fix another line lost in a merge conflict. --- diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx index 4ebce444c..3d7ec82d8 100644 --- a/src/Scenery/tilemgr.cxx +++ b/src/Scenery/tilemgr.cxx @@ -61,7 +61,8 @@ FGTileMgr::FGTileMgr(): vis( 16000 ), _terra_sync(NULL), _visibilityMeters(fgGetNode("/environment/visibility-m", true)), - _maxTileRangeM(fgGetNode("/sim/rendering/static-lod/bare", true)) + _maxTileRangeM(fgGetNode("/sim/rendering/static-lod/bare", true)), + _disableNasalHooks(fgGetNode("/sim/temp/disable-scenery-nasal", true)) { }