[Orxonox-commit 3017] r7714 - in code/branches/ggz2/src/libraries: core tools

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-12-03 14:38:29 +0100 (Fri, 03 Dec 2010)
New Revision: 7714

Modified:
   code/branches/ggz2/src/libraries/core/GUIManager.cc
   code/branches/ggz2/src/libraries/tools/ResourceLocation.cc
Log:
Updating branch for changes in the data repository. Please also update your data repository, or else it won't work.

Modified: code/branches/ggz2/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/ggz2/src/libraries/core/GUIManager.cc	2010-12-03 13:38:23 UTC (rev 7713)
+++ code/branches/ggz2/src/libraries/core/GUIManager.cc	2010-12-03 13:38:29 UTC (rev 7714)
@@ -107,7 +107,7 @@
         // Note: No SceneManager specified yet
         guiRenderer_.reset(new OgreCEGUIRenderer(renderWindow_, Ogre::RENDER_QUEUE_OVERLAY, false, 3000));
         resourceProvider_ = guiRenderer_->createResourceProvider();
-        resourceProvider_->setDefaultResourceGroup("GUI");
+        resourceProvider_->setDefaultResourceGroup("General");
 
         // setup scripting
         luaState_.reset(new LuaState());

Modified: code/branches/ggz2/src/libraries/tools/ResourceLocation.cc
===================================================================
--- code/branches/ggz2/src/libraries/tools/ResourceLocation.cc	2010-12-03 13:38:23 UTC (rev 7713)
+++ code/branches/ggz2/src/libraries/tools/ResourceLocation.cc	2010-12-03 13:38:29 UTC (rev 7714)
@@ -48,7 +48,7 @@
 
         // Default values
         archiveType_ = "FileSystem";
-        bRecursive_  = true;
+        bRecursive_  = false;
     }
 
     ResourceLocation::~ResourceLocation()