[simspark-cvs] simspark/spark/oxygen/geometryserver geometryserver.cpp, 1.2, 1.3

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/geometryserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14965/spark/oxygen/geometryserver

Modified Files:
	geometryserver.cpp 
Log Message:
- merged ROSIMPORTER_XLAB bracnh

Index: geometryserver.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/geometryserver/geometryserver.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** geometryserver.cpp	23 Feb 2006 13:38:36 -0000	1.2
--- geometryserver.cpp	15 Jun 2007 08:48:16 -0000	1.3
***************
*** 125,129 ****
              shared_ptr<TriMesh> mesh = importer->ImportMesh(name,parameter);
  
!             if (mesh.get() == 0)
                  {
                      continue;
--- 125,129 ----
              shared_ptr<TriMesh> mesh = importer->ImportMesh(name,parameter);
  
!             if (mesh.get() == 0 || mesh->GetVertexCount() == 0)
                  {
                      continue;