From d6101558a171dbd2390792ac1e78d09fc2c27711 Mon Sep 17 00:00:00 2001 From: James Cook 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/llviewercontrol.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewercontrol.h') diff --git a/indra/newview/llviewercontrol.h b/indra/newview/llviewercontrol.h index 3271e5fe9b..0e1c24e4fb 100644 --- a/indra/newview/llviewercontrol.h +++ b/indra/newview/llviewercontrol.h @@ -50,9 +50,12 @@ void settings_setup_listeners(); // for the graphics settings void create_graphics_group(LLControlGroup& group); +// convert legacy colors.xml LLSD based color settings to +// newer colors_def.xml XUI/Params based color settings +void convert_legacy_color_settings(); + // saved at end of session extern LLControlGroup gSavedSettings; -extern LLControlGroup gSavedSkinSettings; extern LLControlGroup gSavedPerAccountSettings; extern LLControlGroup gWarningSettings; -- cgit v1.2.3 From 394b28ce77e5e51c41c1d3d9ca9896812f404810 Mon Sep 17 00:00:00 2001 From: Austin Doupnik Date: Thu, 9 Jul 2009 00:59:52 +0000 Subject: DEV-35112 Renamed colors_def.xml to colors.xml. Reviewed by Richard. --- indra/newview/llviewercontrol.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'indra/newview/llviewercontrol.h') diff --git a/indra/newview/llviewercontrol.h b/indra/newview/llviewercontrol.h index 0e1c24e4fb..b1f14eca7b 100644 --- a/indra/newview/llviewercontrol.h +++ b/indra/newview/llviewercontrol.h @@ -50,10 +50,6 @@ void settings_setup_listeners(); // for the graphics settings void create_graphics_group(LLControlGroup& group); -// convert legacy colors.xml LLSD based color settings to -// newer colors_def.xml XUI/Params based color settings -void convert_legacy_color_settings(); - // saved at end of session extern LLControlGroup gSavedSettings; extern LLControlGroup gSavedPerAccountSettings; -- cgit v1.2.3