From d6101558a171dbd2390792ac1e78d09fc2c27711 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 6 Jul 2009 21:58:04 +0000
Subject: Merge xui-army-5 to viewer-2, includes layout, art, and color
 changes, also UI color refactoring and new FreeType font library on Linux.
 svn merge -r126038:126164
 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5

---
 indra/newview/llfloatersettingsdebug.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'indra/newview/llfloatersettingsdebug.cpp')

diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp
index 8b6102c67f..53b40f8b7a 100644
--- a/indra/newview/llfloatersettingsdebug.cpp
+++ b/indra/newview/llfloatersettingsdebug.cpp
@@ -80,10 +80,6 @@ BOOL LLFloaterSettingsDebug::postBuild()
 	{
 		gSavedPerAccountSettings.applyToAll(&func);
 	}
-	if (key == "all" || key == "skin")
-	{
-		gSavedSkinSettings.applyToAll(&func);
-	}
 
 	settings_combo->sortByName();
 	settings_combo->updateSelection();
-- 
cgit v1.2.3