[simspark-cvs] simspark/spark/oxygen/simulationserver simulationserver.cpp, 1.3.2.2.2.1, 1.3.2.2.2.2

[Oliver O. <fr...@us...>]

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

Modified Files:
      Tag: projectx
	simulationserver.cpp 
Log Message:
merge from HEAD


Index: simulationserver.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/simulationserver/simulationserver.cpp,v
retrieving revision 1.3.2.2.2.1
retrieving revision 1.3.2.2.2.2
diff -C2 -d -r1.3.2.2.2.1 -r1.3.2.2.2.2
*** simulationserver.cpp	30 Mar 2007 03:23:23 -0000	1.3.2.2.2.1
--- simulationserver.cpp	17 Jun 2007 07:53:25 -0000	1.3.2.2.2.2
***************
*** 103,106 ****
--- 103,111 ----
  }
  
+ void SimulationServer::ResetTime()
+ {
+     mSimTime = 0.0f;
+ }
+ 
  float SimulationServer::GetSimStep()
  {