[simspark-cvs] simspark/spark/oxygen/sceneserver sceneserver.cpp, 1.2.2.1, 1.2.2.1.2.1

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

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

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


Index: sceneserver.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/sceneserver/sceneserver.cpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.1.2.1
diff -C2 -d -r1.2.2.1 -r1.2.2.1.2.1
*** sceneserver.cpp	16 Feb 2007 15:42:53 -0000	1.2.2.1
--- sceneserver.cpp	17 Jun 2007 07:58:25 -0000	1.2.2.1.2.1
***************
*** 30,33 ****
--- 30,34 ----
  #include "scene.h"
  #include "sceneimporter.h"
+ #include "scenedict.h"
  #include <oxygen/physicsserver/world.h>
  #include <oxygen/physicsserver/space.h>
***************
*** 215,218 ****
--- 216,221 ----
                  shared_static_cast<SceneImporter>(*iter);
  
+             importer->SetSceneDict(&SceneDict::GetInstance());
+ 
              GetLog()->Debug()
                  << "(SceneServer) trying importer " << importer->GetName() << std::endl;