Revision: 7993
          http://playerstage.svn.sourceforge.net/playerstage/?rev=7993&view=rev
Author:   hsujohnhsu
Date:     2009-07-11 22:32:13 +0000 (Sat, 11 Jul 2009)

Log Message:
-----------
remove calls in Model::Load()
this->SetFrictionMode( **this->enableFrictionP );
this->SetCollideMode( **this->collideP );
this->SetLaserFiducialId( **this->laserFiducialP);
this->SetLaserRetro( **this->laserRetroP);
these are redundant as same defaults are set by children objects and overwrite 
any children settings.

I observed occasional segfault on amd64 during add an assert of graphicsHandler 
in Model::Load(), see personalrobots ticket 1797.  After adding 
assert(graphicsHandler) in Model::Load(), this problem went away. hm...

Modified Paths:
--------------
    code/gazebo/trunk/server/Model.cc

Modified: code/gazebo/trunk/server/Model.cc
===================================================================
--- code/gazebo/trunk/server/Model.cc   2009-07-11 21:17:44 UTC (rev 7992)
+++ code/gazebo/trunk/server/Model.cc   2009-07-11 22:32:13 UTC (rev 7993)
@@ -255,18 +255,11 @@
   if (**this->staticP == false)
     this->SetGravityMode( **this->enableGravityP );
 
-  this->SetFrictionMode( **this->enableFrictionP );
-
-  this->SetCollideMode( **this->collideP );
-
-  this->SetLaserFiducialId( **this->laserFiducialP);
-  this->SetLaserRetro( **this->laserRetroP);
-
   // Create the graphics iface handler
   this->graphicsHandler = new GraphicsIfaceHandler();
   this->graphicsHandler->Load(this->GetScopedName(), this);
+  assert(this->graphicsHandler);
 
-
   // Get the name of the python module
   
/*this->pName.reset(PyString_FromString(node->GetString("python","",0).c_str()));
   //this->pName.reset(PyString_FromString("pioneer2dx"));


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge  
This is your chance to win up to $100,000 in prizes! For a limited time, 
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize  
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit

Reply via email to