Commits

Kent Quirk committed 1e042b6

Backed out cpp changes from changeset 49e628c3a0c5

Comments (0)

Files changed (4)

indra/newview/llappviewer.cpp

 	gDirUtilp->initAppDirs("SecondLife");
 	// set skin search path to default, will be overridden later
 	// this allows simple skinned file lookups to work
-	gDirUtilp->setSkinFolder("base");
+	gDirUtilp->setSkinFolder("default");
 
 	initLogging();
 	
     {   
 		// hack to force the skin to default.
         //gDirUtilp->setSkinFolder(skinfolder->getValue().asString());
-		gDirUtilp->setSkinFolder("base");
+		gDirUtilp->setSkinFolder("default");
     }
 
     mYieldTime = gSavedSettings.getS32("YieldTime");

indra/newview/llfloaterpreference.cpp

 		// if skin is set to a skin that no longer exists (silver) set back to default
 		if (getChild<LLRadioGroup>("skin_selection")->getSelectedIndex() < 0)
 		{
-			gSavedSettings.setString("SkinCurrent", "base");
+			gSavedSettings.setString("SkinCurrent", "default");
 			LLFloaterPreference::refreshSkin(this);
 		}
 

indra/newview/llfloateruipreview.cpp

 static std::string get_xui_dir()
 {
 	std::string delim = gDirUtilp->getDirDelimiter();
-	return gDirUtilp->getSkinBaseDir() + delim + "base" + delim + "xui" + delim;
+	return gDirUtilp->getSkinBaseDir() + delim + "default" + delim + "xui" + delim;
 }
 
 // Forward declarations to avoid header dependencies

indra/newview/llviewertexturelist.cpp

 bool LLUIImageList::initFromFile()
 {
 	// construct path to canonical textures.xml in default skin dir
-	std::string base_file_path = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "base", "textures", "textures.xml");
+	std::string base_file_path = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "default", "textures", "textures.xml");
 
 	LLXMLNodePtr root;