Merge branch 'topic/multiplayer' into next

[flightgear.git] / src / Model / model_panel.hxx

diff --git a/src/Model/model_panel.hxx b/src/Model/model_panel.hxx
index 0c1c34a14739ee80fdf4328a89064c334ce00f35..dcf41dd95334a676cf4c0542e165975fcd4e24f4 100644 (file)
--- a/src/Model/model_panel.hxx
+++ b/src/Model/model_panel.hxx
@@ -12,9 +12,8 @@
 
 #include <vector>
 
-SG_USING_STD(vector);
+using std::vector;
 
-#include <simgear/math/point3d.hxx>
 #include <simgear/props/props.hxx>
 
 
@@ -46,9 +45,7 @@ class FGLocation;
  * Subsystems should not normally invoke this function directly;
  * instead, they should use the SGModelLoader declared in loader.hxx.
  */
-osg::Node *fgLoad3DModelPanel( const string& fg_root, const string &path,
-                               SGPropertyNode *prop_root,
-                               double sim_time_sec, const SGPath& livery );
+osg::Node *fgLoad3DModelPanel( const string &path, SGPropertyNode *prop_root);
 
 
 #endif // __MODEL_HXX