diff options
| author | Jacek Antonelli | 2008-12-13 23:31:47 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-13 23:31:47 -0600 |
| commit | d389594c7cb0f4dad5076f33fb0b41ec4f93606e (patch) | |
| tree | 471a75f6455711c6f4e6ba8ec14fe27ba48d3352 /linden/indra/newview/skins/default | |
| parent | Version string generator now includes test label. (diff) | |
| parent | Friends dots show as yellow and color can be set in colors.xml (diff) | |
| download | meta-impy-d389594c7cb0f4dad5076f33fb0b41ec4f93606e.zip meta-impy-d389594c7cb0f4dad5076f33fb0b41ec4f93606e.tar.gz meta-impy-d389594c7cb0f4dad5076f33fb0b41ec4f93606e.tar.bz2 meta-impy-d389594c7cb0f4dad5076f33fb0b41ec4f93606e.tar.xz | |
Merged 'mccabe/VWR-3336' into next
Conflicts:
linden/indra/newview/skins/default/colors_base.xml
linden/indra/newview/skins/silver/colors_base.xml
Diffstat (limited to 'linden/indra/newview/skins/default')
| -rw-r--r-- | linden/indra/newview/skins/default/colors_base.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml index 00007c4..ff3d53e 100644 --- a/linden/indra/newview/skins/default/colors_base.xml +++ b/linden/indra/newview/skins/default/colors_base.xml | |||
| @@ -164,6 +164,8 @@ | |||
| 164 | <NetMapGroupOwnBelowWater value="200, 0, 200, 255" /> <!-- Group owned objects below water --> | 164 | <NetMapGroupOwnBelowWater value="200, 0, 200, 255" /> <!-- Group owned objects below water --> |
| 165 | <NetMapOtherOwnAboveWater value="60, 60, 60, 255" /> <!-- Objects owned by others above water --> | 165 | <NetMapOtherOwnAboveWater value="60, 60, 60, 255" /> <!-- Objects owned by others above water --> |
| 166 | <NetMapOtherOwnBelowWater value="30, 30, 30, 255" /> <!-- Objects owned by others below water --> | 166 | <NetMapOtherOwnBelowWater value="30, 30, 30, 255" /> <!-- Objects owned by others below water --> |
| 167 | <NetMapGlyphColorAvatar value="0, 255, 0, 255" /> <!-- Also the color of avatar glyphs on the map --> | ||
| 168 | <NetMapGlyphColorFriend value="255, 255, 0, 255" /> | ||
| 167 | 169 | ||
| 168 | <!-- INVENTORY --> | 170 | <!-- INVENTORY --> |
| 169 | <InventoryBackgroundColor value="62, 62, 62, 80"/> <!-- Inventory floater background --> | 171 | <InventoryBackgroundColor value="62, 62, 62, 80"/> <!-- Inventory floater background --> |
| @@ -173,6 +175,14 @@ | |||
| 173 | <FilterTextColor value="255, 200, 70, 255" /> <!-- Inventory search text --> | 175 | <FilterTextColor value="255, 200, 70, 255" /> <!-- Inventory search text --> |
| 174 | <InventorySearchStatusColor value="255, 255, 255, 255" /> <!-- "Searching..." --> | 176 | <InventorySearchStatusColor value="255, 255, 255, 255" /> <!-- "Searching..." --> |
| 175 | 177 | ||
| 178 | <!-- HELP WINDOW --> | ||
| 179 | <HelpBgColor value="200, 209, 204, 255" /> | ||
| 180 | <HelpFgColor value="0, 0, 0, 255" /> | ||
| 181 | <HelpScrollTrackColor value="183, 184, 188, 255" /> | ||
| 182 | <HelpScrollThumbColor value="80, 96, 124, 255" /> | ||
| 183 | <HelpScrollHighlightColor value="115, 132, 155, 255" /> | ||
| 184 | <HelpScrollShadowColor value="0, 0, 0, 255" /> | ||
| 185 | |||
| 176 | <!-- MISC --> | 186 | <!-- MISC --> |
| 177 | <AvatarNameColor value="251, 175, 93, 255" /> <!-- Text color of avatar nametags --> | 187 | <AvatarNameColor value="251, 175, 93, 255" /> <!-- Text color of avatar nametags --> |
| 178 | <FocusColor value="239, 156, 0, 255" /> <!-- Color of the glow around UI controls with keyboard focus --> | 188 | <FocusColor value="239, 156, 0, 255" /> <!-- Color of the glow around UI controls with keyboard focus --> |