aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/silver
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-29 00:38:10 -0700
committerMcCabe Maxsted2009-09-29 00:40:04 -0700
commit4848bcd1c547c3fed705f57053fdc10df9855885 (patch)
tree02c2b748262b45c59a7bc3ae57435539e10cef67 /linden/indra/newview/skins/silver
parentFixed Advanced Sky only toggling once (diff)
downloadmeta-impy-4848bcd1c547c3fed705f57053fdc10df9855885.zip
meta-impy-4848bcd1c547c3fed705f57053fdc10df9855885.tar.gz
meta-impy-4848bcd1c547c3fed705f57053fdc10df9855885.tar.bz2
meta-impy-4848bcd1c547c3fed705f57053fdc10df9855885.tar.xz
Renamed ScriptBgReadOnlyColor to ScrollReadOnlyColor so we don't lose it in a merge
Diffstat (limited to 'linden/indra/newview/skins/silver')
-rw-r--r--linden/indra/newview/skins/silver/colors_base.xml4
1 files changed, 2 insertions, 2 deletions
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 @@
68<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- Text of read-only items embedded in notecards --> 68<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- Text of read-only items embedded in notecards -->
69<TextEmbeddedItemColor value="0, 0, 128, 255" /> <!-- Text of items embedded in notecards --> 69<TextEmbeddedItemColor value="0, 0, 128, 255" /> <!-- Text of items embedded in notecards -->
70<TextDefaultColor value="0, 20, 0, 255"/> <!-- Non-keyword text in the script editor --> 70<TextDefaultColor value="0, 20, 0, 255"/> <!-- Non-keyword text in the script editor -->
71<ScriptBgReadOnlyColor value="180, 180, 180, 255" /> <!-- Not used -->
72<TextLinkColor value="0, 20, 255, 255"/> 71<TextLinkColor value="0, 20, 255, 255"/>
73<TextLinkHoverColor value="0, 50, 255, 255"/> 72<TextLinkHoverColor value="0, 50, 255, 255"/>
74 73
@@ -83,7 +82,8 @@
83<ScrollHighlightedColor value="145, 180, 220, 128" /> <!-- Hover color --> 82<ScrollHighlightedColor value="145, 180, 220, 128" /> <!-- Hover color -->
84<ScrollbarThumbColor value="120, 160, 200, 255" /> <!-- Scroll bar --> 83<ScrollbarThumbColor value="120, 160, 200, 255" /> <!-- Scroll bar -->
85<ScrollbarTrackColor value="183, 202, 220, 255" /> <!-- Scroll bar background --> 84<ScrollbarTrackColor value="183, 202, 220, 255" /> <!-- Scroll bar background -->
86 85<ScrollReadOnlyColor value="180, 180, 180, 255" /> <!-- Color for inactive but not disabled lists -->
86
87<!-- MENUS --> 87<!-- MENUS -->
88<MenuBarBgColor value="185, 200, 220, 230" /> <!-- Menu bar background --> 88<MenuBarBgColor value="185, 200, 220, 230" /> <!-- Menu bar background -->
89<MenuBarGodBgColor value="100, 200, 130, 230" /> <!-- Menu bar background with God Mode enabled --> 89<MenuBarGodBgColor value="100, 200, 130, 230" /> <!-- Menu bar background with God Mode enabled -->