4 files changed, 13 insertions, 6 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                       -=
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 5fed44c..872c5e7 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1567,7 +1567,7 @@ void LLPanelAvatar::resetGroupList()
                                 else
                                 {
                                         row["columns"][0]["value"] = group_string + " " + getString("HiddenLabel");
-                                        row["columns"][0]["color"] = gColors.getColor("ScriptBgReadOnlyColor").getValue();
+                                        row["columns"][0]["color"] = gColors.getColor("ScrollReadOnlyColor").getValue();
                                 }
                                 group_list->addElement(row);
                         }
@@ -2086,7 +2086,7 @@ void LLPanelAvatar::processAvatarGroupsReply(LLMessageSystem *msg, void**)
                                 else
                                 {
                                         row["columns"][0]["value"] = group_string + " " + self->getString("HiddenLabel");
-                                        row["columns"][0]["color"] = gColors.getColor("ScriptBgReadOnlyColor").getValue();
+                                        row["columns"][0]["color"] = gColors.getColor("ScrollReadOnlyColor").getValue();
                                 }
                                 if (group_list)
                                 {
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 9ad1787..8f0fc29 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -68,7 +68,6 @@
 <TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- Text of read-only items embedded in notecards -->
 <TextEmbeddedItemColor value="0, 0, 128, 255" />            <!-- Text of items embedded in notecards -->
 <TextDefaultColor value="0, 20, 0, 255"/>                   <!-- Non-keyword text in the script editor -->
-<ScriptBgReadOnlyColor value="100, 100, 100, 255" />        <!-- Not used -->
 <TextLinkColor value="144, 165, 208, 255"/>
 <TextLinkHoverColor value="255, 255, 255, 255"/>
   
@@ -83,6 +82,7 @@
 <ScrollHighlightedColor value="183, 184, 188, 128" />   <!-- Hover color -->
 <ScrollbarThumbColor value="60, 76, 124, 255" />        <!-- Scroll bar -->
 <ScrollbarTrackColor value="153, 154, 158, 255" />      <!-- Scroll bar background -->
+<ScrollReadOnlyColor value="100, 100, 100, 255" />      <!-- Color for inactive but not disabled lists -->
  
 <!-- MENUS -->
 <MenuBarBgColor value="62, 62, 62, 255" />                  <!-- Menu bar background -->
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index abe61bf..6a94489 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -68,7 +68,6 @@
 <TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- Text of read-only items embedded in notecards -->
 <TextEmbeddedItemColor value="0, 0, 128, 255" />            <!-- Text of items embedded in notecards -->
 <TextDefaultColor value="0, 20, 0, 255"/>                   <!-- Non-keyword text in the script editor -->
-<ScriptBgReadOnlyColor value="180, 180, 180, 255" />        <!-- Not used -->
 <TextLinkColor value="0, 20, 255, 255"/>
 <TextLinkHoverColor value="0, 50, 255, 255"/>
  
@@ -83,7 +82,8 @@
 <ScrollHighlightedColor value="145, 180, 220, 128" />   <!-- Hover color -->
 <ScrollbarThumbColor value="120, 160, 200, 255" />      <!-- Scroll bar -->
 <ScrollbarTrackColor value="183, 202, 220, 255" />      <!-- Scroll bar background -->
- 
+<ScrollReadOnlyColor value="180, 180, 180, 255" />      <!-- Color for inactive but not disabled lists -->
+  
 <!-- MENUS -->
 <MenuBarBgColor value="185, 200, 220, 230" />               <!-- Menu bar background -->
 <MenuBarGodBgColor value="100, 200, 130, 230" />            <!-- Menu bar background with God Mode enabled -->