Renamed ScriptBgReadOnlyColor to ScrollReadOnlyColor so we don't lose it in a merge

1 files changed, 8 insertions, 1 deletions

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  <hakushakukun@gmail.com>
 
+        * 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                       -=