[simspark-cvs] simspark/spark/oxygen/physicsserver dragcontroller.cpp, 1.2, 1.3 space.cpp, 1.3, 1.4

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

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

Modified Files:
	dragcontroller.cpp space.cpp 
Log Message:
merge from projectx branch

Index: space.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/space.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** space.cpp	1 May 2007 13:14:40 -0000	1.3
--- space.cpp	17 Jun 2007 13:38:32 -0000	1.4
***************
*** 195,199 ****
  }
  
! void Space::DestroySpaceObjects()
  {
      shared_ptr<Scene> scene = GetScene();
--- 195,200 ----
  }
  
! void 
! Space::DestroySpaceObjects()
  {
      shared_ptr<Scene> scene = GetScene();
***************
*** 238,242 ****
  }
  
! void Space::DestroyODEObject()
  {
      if (! mODESpace)
--- 239,244 ----
  }
  
! void 
! Space::DestroyODEObject()
  {
      if (! mODESpace)

Index: dragcontroller.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/dragcontroller.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dragcontroller.cpp	12 Feb 2006 11:36:52 -0000	1.2
--- dragcontroller.cpp	17 Jun 2007 13:38:32 -0000	1.3
***************
*** 40,44 ****
          return;
      }
- 
      if (mLinearDrag > 0)
      {
--- 40,43 ----