[simspark-cvs] simspark/spark/oxygen/sceneserver basenode.h, 1.1, 1.1.4.1

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

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

Modified Files:
      Tag: projectx
	basenode.h 
Log Message:
merge from HEAD


Index: basenode.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/basenode.h,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** basenode.h	5 Dec 2005 21:21:17 -0000	1.1
--- basenode.h	17 Jun 2007 08:04:32 -0000	1.1.4.1
***************
*** 111,115 ****
      /** returns the corresponding local coordinates to the given world
          coordinates */
!     salt::Vector3f GetLocalPos(const salt::Vector3f& worldPos);
  
      /** updates internal state before physics calculation */
--- 111,115 ----
      /** returns the corresponding local coordinates to the given world
          coordinates */
!     salt::Vector3f GetLocalPos(const salt::Vector3f& worldPos) const;
  
      /** updates internal state before physics calculation */