Changeset 7717 for code/branches/masterserver/src

Timestamp:

Dec 3, 2010, 2:38:46 PM (14 years ago)

Author:

dafrick

Message:

Updating branch for changes in the data repository. Please also update your data repository, or else it won't work.

Location:

code/branches/masterserver/src/libraries

Files:

• core/GUIManager.cc (modified) (1 diff)
• tools/ResourceLocation.cc (modified) (1 diff)

code/branches/masterserver/src/libraries/core/GUIManager.cc

@@ -123 +123 @@
         guiRenderer_.reset(new OgreCEGUIRenderer(GraphicsManager::getInstance().getRenderWindow(), Ogre::RENDER_QUEUE_OVERLAY, false, 3000));
         resourceProvider_ = guiRenderer_->createResourceProvider();
-        resourceProvider_->setDefaultResourceGroup("GUI");
+        resourceProvider_->setDefaultResourceGroup("General");
 
         // Setup scripting

code/branches/masterserver/src/libraries/tools/ResourceLocation.cc

@@ -49 +49 @@
         // Default values
         archiveType_ = "FileSystem";
-        bRecursive_  = true;
+        bRecursive_  = false;
     }