1 files changed, 0 insertions, 64 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 0f3feb789f..0a71c14120 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -601,70 +601,6 @@ void settings_setup_listeners()
 	gSavedSettings.getControl("VelocityInterpolate")->getSignal()->connect(boost::bind(&handleVelocityInterpolate, _2));
 }
 
-class ColorConvertFunctor : public LLControlGroup::ApplyFunctor
-{
-public:
-    ColorConvertFunctor(LLUIColorTable::Params& params)
-        :mParams(params)
-    {
-    }
-
-    void apply(const std::string& name, LLControlVariable* control)
-    {
-        if(control->isType(TYPE_COL4))
-        {
-            LLUIColorTable::ColorParams color_params;
-            color_params.value = LLColor4(control->getValue());
-
-            mParams.color_entries.add(LLUIColorTable::ColorEntryParams().name(name).color(color_params));
-        }
-    }
-
-private:
-    LLUIColorTable::Params& mParams;
-};
-
-static void convert_legacy_color_settings(const std::string& location_key, ELLPath path)
-{
-	LLControlGroup::getInstance("Skinning")->cleanup();
-	LLAppViewer::instance()->loadSettingsFromDirectory(location_key);
-
-	LLUIColorTable::Params params;
-	ColorConvertFunctor ccf(params);
-	LLControlGroup::getInstance("Skinning")->applyToAll(&ccf);
-
-	LLXMLNodePtr output_node = new LLXMLNode("colors", false);
-	LLXUIParser::instance().writeXUI(output_node, params);
-
-	if(!output_node->isNull())
-	{
-		std::string filename = gDirUtilp->getExpandedFilename(path, "colors_def.xml");
-		LLFILE *fp = LLFile::fopen(filename, "w");
-
-		if(fp != NULL)
-		{
-			LLXMLNode::writeHeaderToFile(fp);
-			output_node->writeToFile(fp);
-
-			fclose(fp);
-		}
-	}
-
-	LLControlGroup::getInstance("Skinning")->cleanup();
-}
-
-void convert_legacy_color_settings()
-{
-	LLControlGroup saved_skin_settings("Skinning");
-
-	convert_legacy_color_settings("DefaultSkin", LL_PATH_DEFAULT_SKIN);
-	convert_legacy_color_settings("CurrentSkin", LL_PATH_TOP_SKIN);
-	convert_legacy_color_settings("UserSkin", LL_PATH_USER_SKIN);
-
-	saved_skin_settings.cleanup();
-}
-
-
 #if TEST_CACHED_CONTROL
 
 #define DECL_LLCC(T, V) static LLCachedControl<T> mySetting_##T("TestCachedControl"#T, V)