Revision: 8814
http://playerstage.svn.sourceforge.net/playerstage/?rev=8814&view=rev
Author: natepak
Date: 2010-07-06 18:10:34 +0000 (Tue, 06 Jul 2010)
Log Message:
-----------
Fixed some path info
Modified Paths:
--------------
code/gazebo/trunk/server/GazeboConfig.cc
Modified: code/gazebo/trunk/server/GazeboConfig.cc
===================================================================
--- code/gazebo/trunk/server/GazeboConfig.cc 2010-07-03 03:47:19 UTC (rev
8813)
+++ code/gazebo/trunk/server/GazeboConfig.cc 2010-07-06 18:10:34 UTC (rev
8814)
@@ -77,7 +77,7 @@
rc.Load(rcFilename);
// if gazebo path is set, skip reading from .gazeborc
- if(this->ogrePaths.empty() && !ogre_resource_path)
+ if(!ogre_resource_path)
{
node = rc.GetRootNode()->GetChild("gazeboPath");
while (node)
@@ -90,7 +90,7 @@
}
// if ogre path is set, skip reading from .gazeborc
- if(this->ogrePaths.empty() && !ogre_resource_path)
+ if(!ogre_resource_path)
{
node = rc.GetRootNode()->GetChild("ogrePath");
while (node)
@@ -106,13 +106,13 @@
{
gzmsg(0) << "Unable to find the file ~/.gazeborc. Using default paths.
This may cause OGRE to fail.\n";
- if (this->gazeboPaths.empty() && !gazebo_resource_path )
+ if (!gazebo_resource_path )
{
this->gazeboPaths.push_back("/usr/local/share/gazebo");
this->AddPluginPaths("/usr/local/share/gazebo/plugins");
}
- if (this->ogrePaths.empty() && !ogre_resource_path )
+ if (!ogre_resource_path )
{
this->ogrePaths.push_back("/usr/local/lib/OGRE");
this->ogrePaths.push_back("/usr/lib/OGRE");
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 Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
