Revision: 6963
http://playerstage.svn.sourceforge.net/playerstage/?rev=6963&view=rev
Author: natepak
Date: 2008-08-20 21:22:19 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
Added patch 2003321 by John Hsu
Modified Paths:
--------------
code/gazebo/trunk/server/GazeboConfig.cc
Modified: code/gazebo/trunk/server/GazeboConfig.cc
===================================================================
--- code/gazebo/trunk/server/GazeboConfig.cc 2008-08-20 21:08:32 UTC (rev
6962)
+++ code/gazebo/trunk/server/GazeboConfig.cc 2008-08-20 21:22:19 UTC (rev
6963)
@@ -56,6 +56,22 @@
cfgFile.open(rcFilename.c_str(), std::ios::in);
+ char *ogre_resource_path = getenv("OGRE_RESOURCE_PATH");
+ if(ogre_resource_path)
+ {
+ this->ogrePaths.push_back(ogre_resource_path);
+ }
+ char *gazebo_resource_path = getenv("GAZEBO_RESOURCE_PATH");
+ if(gazebo_resource_path)
+ {
+ this->gazeboPaths.push_back(gazebo_resource_path);
+ }
+
+ // if both paths are set, don't check the config file or use the defaults.
+ if(ogre_resource_path && gazebo_resource_path)
+ return;
+
+
if (cfgFile)
{
XMLConfig rc;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
