From 4848bcd1c547c3fed705f57053fdc10df9855885 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 29 Sep 2009 00:38:10 -0700 Subject: Renamed ScriptBgReadOnlyColor to ScrollReadOnlyColor so we don't lose it in a merge --- ChangeLog.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'ChangeLog.txt') diff --git a/ChangeLog.txt b/ChangeLog.txt index d7e84c7..4932ebe 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,9 +1,16 @@ 2009-09-28 McCabe Maxsted + * Renamed ScriptBgReadOnlyColor to ScrollReadOnlyColor so we don't lose it in a merge. + + modified: linden/indra/newview/llpanelavatar.cpp + modified: linden/indra/newview/skins/default/colors_base.xml + modified: linden/indra/newview/skins/silver/colors_base.xml + + * Fixed Advanced Sky only toggling once. modified: linden/indra/newview/llfloaterwindlight.cpp - + =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- =- 1.2.0 BETA -= -- cgit v1.1