From 105fa110771594135c9b07088099b9487a8b7a45 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 23 Nov 2008 22:16:16 -0700
Subject: Added full comments to colors_base.xml files.

---
 ChangeLog.txt                                      |   8 +
 linden/indra/newview/skins/default/colors_base.xml | 325 +++++++++---------
 linden/indra/newview/skins/silver/colors_base.xml  | 374 ++++++++++-----------
 3 files changed, 355 insertions(+), 352 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 0741140..ff91f69 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,4 +1,12 @@
 
+2008-11-22  McCabe Maxsted  <hakushakukun@gmail.com>
+
+	* linden\indra\newview\skins\default\colors_base.xml:
+	Added full comments to default skin colors.
+	* linden\indra\newview\skins\silver\colors_base.xml:
+	Added full comments to silver skin colors.
+
+
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 =-                         1.0.0                          -=
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 3b85efa..00007c4 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -1,189 +1,186 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings version = "101">
-    
+<!-- Additional comments by McCabe Maxsted -->
+ 
 <!-- WINDOWS -->
-<TitleBarFocusColor value="255, 255, 255, 30" />	<!-- Focused window title bar highlight, no equivalent for unfocused windows -->
-<FloaterFocusBorderColor value="0, 0, 0, 80" />
-<FloaterUnfocusBorderColor value="0, 0, 0, 80" />
-<FocusBackgroundColor value="62, 62, 62, 255" />	<!-- Background color of focused floaters -->
-<DefaultBackgroundColor value="62, 62, 62, 140" />	<!-- Background color for unfocused floaters -->
-<ColorDropShadow value="0, 0, 0, 200" />		<!-- The drop shadow behind windows and menus -->
+<TitleBarFocusColor value="255, 255, 255, 30" />        <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
+<FloaterFocusBorderColor value="0, 0, 0, 80" />         <!-- Focused window border color -->
+<FloaterUnfocusBorderColor value="0, 0, 0, 80" />       <!-- Unfocused window border color -->
+<FocusBackgroundColor value="62, 62, 62, 255" />        <!-- Background color of focused windows -->
+<DefaultBackgroundColor value="62, 62, 62, 140" />      <!-- Background color for unfocused windows -->
+<ColorDropShadow value="0, 0, 0, 200" />                <!-- The drop shadow behind windows and menus -->
 <DefaultHighlightDark value="26, 26, 26, 255" />
-<DefaultHighlightLight value="115, 132, 155, 255" />
-<DefaultShadowDark value="26, 26, 26, 255" />
-<DefaultShadowLight value="0, 0, 0, 255" />
-
-<!-- LABELS -->
-<LabelDisabledColor value="147, 169, 213, 77" />
-<LabelSelectedColor value="255, 255, 255, 255" />
+<DefaultHighlightLight value="115, 132, 155, 255" />    <!-- Unfocused border, bottom portion -->
+<DefaultShadowDark value="26, 26, 26, 255" />           <!-- Unfocused border, top portion -->
+<DefaultShadowLight value="0, 0, 0, 255" />             <!-- Tab area border for IMs -->
+ 
+<!-- WINDOW LABELS -->
+<LabelDisabledColor value="147, 169, 213, 77" />            <!-- Color for unfocused window titles -->
+<LabelSelectedColor value="255, 255, 255, 255" />           <!-- Color for mouseovered clickable labels, e.g. version info on the login screen -->
 <LabelSelectedDisabledColor value="164, 190, 237, 128" />
-<LabelTextColor value="147, 169, 213, 255" />
-
+<LabelTextColor value="147, 169, 213, 255" />               <!-- Color for window labels and titles -->
+ 
 <!-- LOGIN -->
-<LoginProgressBarBgColor value="255, 255, 255, 255" />
-<LoginProgressBarFgColor value="255, 255, 255, 255" />
-<LoginProgressBoxBorderColor value="0, 30, 60, 0" />
-<LoginProgressBoxCenterColor value="0, 0, 0, 200" />
-<LoginProgressBoxShadowColor value="0, 0, 0, 200" />
-<LoginProgressBoxTextColor value="255, 255, 255, 255"/>
-
+<LoginProgressBarBgColor value="255, 255, 255, 255" />      <!-- Login progress bar background -->
+<LoginProgressBarFgColor value="255, 255, 255, 255" />      <!-- Login progress bar -->
+<LoginProgressBoxBorderColor value="0, 30, 60, 0" />        <!-- Login progress box border -->
+<LoginProgressBoxCenterColor value="0, 0, 0, 200" />        <!-- Login progress box background -->
+<LoginProgressBoxShadowColor value="0, 0, 0, 200" />        <!-- Login progress box shadow -->
+<LoginProgressBoxTextColor value="255, 255, 255, 255"/>     <!-- Login progress text -->
+ 
 <!-- BUTTONS -->
-<ButtonLabelColor value="220, 220, 220, 255" /> 	<!-- Text labels for buttons, like the "OK" text -->
-<ButtonLabelSelectedColor value="220, 220, 220, 255" />
-<ButtonLabelDisabledColor value="147, 169, 213, 200" />
-<ButtonLabelSelectedDisabledColor value="164, 190, 237, 200" />
-<ButtonSelectedBgColor value="62, 62, 62, 255" />
-<ButtonSelectedColor value="255, 255, 255, 255" />
-<ButtonUnselectedBgColor value="62, 62, 62, 255" />
-<ButtonUnselectedFgColor value="255, 255, 255, 255" />
-<ButtonBorderColor value="239, 156, 0, 255" />
-<ButtonFlashBgColor value="255, 190, 62, 127" />
-<ButtonColor value="255, 255, 255, 255" /> 		<!-- Blended with button art, usually left as opaque white -->
-<ButtonImageColor value="255, 255, 255, 255" /> 	<!-- Blended with button art, usually left as opaque white -->
-
-<!-- SLIDERS -->
-<SliderDisabledThumbColor value="0, 0, 0, 255" />
-<SliderThumbCenterColor value="200, 200, 200, 255" />
-<SliderThumbOutlineColor value="255, 255, 255, 255" />
-<SliderTrackColor value="255, 255, 255, 255" />
-
+<ButtonLabelColor value="220, 220, 220, 255" />                 <!-- Label text color for buttons, like the "OK" text -->
+<ButtonLabelSelectedColor value="220, 220, 220, 255" />         <!-- Label text color when button selected -->
+<ButtonLabelDisabledColor value="147, 169, 213, 200" />         <!-- Label text color when button disabled -->
+<ButtonLabelSelectedDisabledColor value="164, 190, 237, 200" /> <!-- Label text color when button disabled but selected -->
+<ButtonSelectedBgColor value="62, 62, 62, 255" />           <!-- Not used -->
+<ButtonSelectedColor value="255, 255, 255, 255" />          <!-- Not used -->
+<ButtonUnselectedBgColor value="62, 62, 62, 255" />         <!-- Not used -->
+<ButtonUnselectedFgColor value="255, 255, 255, 255" />      <!-- Not used -->
+<ButtonBorderColor value="239, 156, 0, 255" />              <!-- Not used -->
+<ButtonFlashBgColor value="255, 190, 62, 127" />            <!-- Color of tab flashing on incoming IM -->
+<ButtonColor value="255, 255, 255, 255" />                  <!-- Blended with button art, usually left as opaque white -->
+<ButtonImageColor value="255, 255, 255, 255" />             <!-- Button color override (also checkboxes and scroll arrows).
+                                                                 Blended with button art, usually left as opaque white -->
+ 
+<!-- SLIDERS, single line -->
+<SliderDisabledThumbColor value="0, 0, 0, 255" />           <!-- Not used -->
+<SliderThumbCenterColor value="200, 200, 200, 255" />       <!-- Unfocused slider thumb color -->
+<SliderThumbOutlineColor value="255, 255, 255, 255" />      <!-- Focused slider thumb color -->
+<SliderTrackColor value="255, 255, 255, 255" />             <!-- Not used -->
+ 
+<!-- SLIDERS, multi line (as in the sky editor) -->
+<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>           <!-- Not used -->       
+<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>       <!-- Not used -->   
+<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>            <!-- Not used -->
+<MultiSliderTrackColor value="30, 30, 30, 255"/>                <!-- Not used -->
+<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/> <!-- Not used -->
+<MultiSliderTriangleColor value="255, 255, 50, 255"/>           <!-- Not used -->
+ 
 <!-- TEXTFIELDS -->
-<TextBgFocusColor value="200, 209, 204, 255" />		<!-- Text field background when receiving input (focused) -->
-<TextBgReadOnlyColor value="62, 62, 62, 160" />	        <!-- Text field background when read-only -->
-<TextBgWriteableColor value="200, 209, 204, 230" />	<!-- Text field background when not receiving input (unfocused) -->
-<TextCursorColor value="0, 0, 0, 255" />
-<TextFgColor value="0, 0, 0, 255" />
-<TextFgReadOnlyColor value="255, 255, 255, 200" />
-<TextFgTentativeColor value="0, 0, 0, 128" />
-<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" />	<!-- i.e. About Land name that you don't own -->
-<TextEmbeddedItemColor value="0, 0, 128, 255" />
-<TextDefaultColor value="0, 20, 0, 255"/>
-  
+<TextBgFocusColor value="200, 209, 204, 255" />             <!-- Text field background when receiving input (focused) -->
+<TextBgReadOnlyColor value="62, 62, 62, 160" />             <!-- Text field background when read-only -->
+<TextBgWriteableColor value="200, 209, 204, 230" />         <!-- Text field background when not receiving input (unfocused) -->
+<TextCursorColor value="0, 0, 0, 255" />                    <!-- Cursor color in notecards and scripts only -->
+<TextFgColor value="0, 0, 0, 255" />                         <!-- Text color for all text entry fields; cursor color for line editors -->
+<TextFgReadOnlyColor value="255, 255, 255, 200" />          <!-- Text color in read-only fields -->
+<TextFgTentativeColor value="0, 0, 0, 128" />               <!-- Initial entry in text entry fields, e.g. "Click here to chat." -->
+<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 -->
+ 
 <!-- LISTBOXES -->
-<ScrollBgReadOnlyColor value="200, 209, 204, 255" />
-<ScrollBgWriteableColor value="200, 209, 204, 255" />
-<ScrollBGStripeColor value="100, 100, 100, 40" />
-<ScrollDisabledColor value="128, 128, 128, 204" />
-<ScrollSelectedBGColor value="100, 100, 188, 150" />
-<ScrollSelectedFGColor value="0, 0, 0, 204" />	            <!-- Text color -->
-<ScrollUnselectedColor value="0, 0, 0, 204" />	            <!-- Text color -->
-<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-->
-
+<ScrollBgReadOnlyColor value="200, 209, 204, 255" />    <!-- Background of read only lists -->
+<ScrollBgWriteableColor value="200, 209, 204, 255" />   <!-- Background of editable lists, e.g. groups-->
+<ScrollBGStripeColor value="100, 100, 100, 40" />       <!-- Background stripes in sortable lists, e.g. Events Search -->
+<ScrollDisabledColor value="128, 128, 128, 204" />      
+<ScrollSelectedBGColor value="100, 100, 188, 150" />    <!-- Selected item in a list highlight -->
+<ScrollSelectedFGColor value="0, 0, 0, 204" />          <!-- Text color -->
+<ScrollUnselectedColor value="0, 0, 0, 204" />          <!-- Text color -->
+<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 -->
+ 
 <!-- MENUS -->
-<MenuBarBgColor value="62, 62, 62, 255" />
-<MenuBarGodBgColor value="62, 128, 62, 255" />
-<MenuNonProductionGodBgColor value="0, 128, 0, 255" />
-<MenuNonProductionBgColor value="128, 0, 0, 255" />
-<MenuDefaultBgColor value="0, 0, 0, 255" />
+<MenuBarBgColor value="62, 62, 62, 255" />                  <!-- Menu bar background -->
+<MenuBarGodBgColor value="62, 128, 62, 255" />              <!-- Menu bar background with God Mode enabled -->
+<MenuNonProductionGodBgColor value="0, 128, 0, 255" />      <!-- Beta viewer menu bar background -->
+<MenuNonProductionBgColor value="128, 0, 0, 255" />         <!-- Beta viewer menu bar background with God Mode enabled -->
+<MenuDefaultBgColor value="0, 0, 0, 255" />                 <!-- Menu background -->
 <MenuItemDisabledColor value="133, 133, 164, 128" />        <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
 <MenuItemEnabledColor value="255, 255, 255, 255" />         <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
-<MenuItemHighlightBgColor value="183, 184, 188, 100" />
-<MenuItemHighlightFgColor value="255, 255, 255, 255" />	    <!-- Highlighted menu text color; also treeview node selection highlight -->
-<MenuPopupBgColor value="0, 0, 0, 255" />
-
+<MenuItemHighlightBgColor value="183, 184, 188, 100" />     <!-- Highlighted menu item background color -->
+<MenuItemHighlightFgColor value="255, 255, 255, 255" />     <!-- Highlighted menu item text color; also treeview node selection highlight -->
+<MenuPopupBgColor value="0, 0, 0, 255" />                   <!-- Right-click menu background -->
+ 
 <!--  PIE MENUS -->
-<PieMenuBgColor value="62, 62, 62, 150" />
-<PieMenuLineColor value="0, 0, 0, 128" />
-<PieMenuSelectedColor value="183, 184, 188, 77" />
-
+<PieMenuBgColor value="62, 62, 62, 150" />              <!-- Color of pie menu -->
+<PieMenuLineColor value="0, 0, 0, 128" />               <!-- Color of pie menu slice separators -->
+<PieMenuSelectedColor value="183, 184, 188, 77" />      <!-- Color of pie menu slice when selected -->
+ 
+<!-- MENU BAR -->
+<ParcelTextColor value="144, 165, 208, 255" />		<!-- Parcel name on menu bar, normal state -->
+<ParcelHoverColor value="255, 255, 255, 255" />		<!-- Parcel name on menu bar, hover state -->
+<TimeTextColor value="255, 255, 255, 255" />		<!-- SL Time on menu bar -->
+<BalanceTextColor value="0, 255, 0, 255" />		<!-- Linden dollar balance on menu bar -->
+<HealthTextColor value="255, 255, 255, 255" />		<!-- Damage meter text on menu bar -->
+ 
 <!-- TOOLTIPS -->
-<ToolTipBgColor value="183, 184, 188, 200" />
-<ToolTipBorderColor value="171, 212, 245, 255" />
-<ToolTipTextColor value="0, 0, 0, 255" />
-
+<ToolTipBgColor value="183, 184, 188, 200" />           <!-- Tool tips, i.e. "Hover Tips" -->
+<ToolTipBorderColor value="171, 212, 245, 255" />       <!-- Not used -->
+<ToolTipTextColor value="0, 0, 0, 255" />               <!-- Tool tips text color -->
+ 
 <!-- NOTIFICATION POP-UPS -->
-<NotifyBoxColor value="70, 170, 255, 255" />
-<NotifyTextColor value="0, 0, 0, 255" />
-<NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
-<NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
-<GroupNotifyBoxColor value="70, 170, 255, 255" />
-<GroupNotifyTextColor value="0, 30, 60, 255" />
-
+<NotifyBoxColor value="70, 170, 255, 255" />            <!-- Notification background, i.e. tp requests -->
+<NotifyTextColor value="0, 0, 0, 255" />                <!-- Notification text -->
+<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- Background color of caution permissions prompts -->
+<NotifyCautionWarnColor value="0, 0, 0, 255" />         <!-- Foreground color of the special title text in caution permissions prompts -->
+<GroupNotifyBoxColor value="70, 170, 255, 255" />       <!-- Group notices background -->
+<GroupNotifyTextColor value="0, 30, 60, 255" />         <!-- Group notices text -->
+ 
+<!-- ALERT BOX COLORS -->
+<AlertBoxColor value="62, 62, 62, 255" />               <!-- Alert floaters, like the warning before returning objects -->
+<AlertTextColor value="147, 169, 213, 255" />           <!-- Alert floater text -->
+<AlertCautionBoxColor value="254, 209, 118, 255" />     <!-- Background color of caution alerts -->
+<AlertCautionTextColor value="0, 0, 0, 255" />          <!-- Foreground color of the special title text in caution alerts -->
+ 
 <!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
-<ChatHistoryBgColor value="0, 0, 0, 0" />
-<ChatHistoryTextColor value="255, 255, 255, 255" />
-<IMHistoryBgColor value="0, 30, 80, 200" />
-<IMHistoryTextColor value="255, 255, 255, 255" />
-
+<ChatHistoryBgColor value="0, 0, 0, 0" />               <!-- Local Chat background -->
+<ChatHistoryTextColor value="255, 255, 255, 255" />     <!-- Local Chat text -->
+<IMHistoryBgColor value="0, 30, 80, 200" />             <!-- Instant Message background -->
+<IMHistoryTextColor value="255, 255, 255, 255" />       <!-- Instant Message text -->
+ 
 <!-- IN-WORLD SELECTION -->
-<SilhouetteParentColor value="255, 255, 0, 255" />
-<SilhouetteChildColor value="32, 106, 196, 255" />
+<SilhouetteParentColor value="255, 255, 0, 255" />      <!-- Root prim selection outline -->
+<SilhouetteChildColor value="32, 106, 196, 255" />      <!-- Child prim selection outline -->
 <HighlightParentColor value="171, 212, 245, 255" />
 <HighlightChildColor value="171, 212, 245, 255" />
-<HighlightInspectColor value="255, 0, 255, 255" />
-
+<HighlightInspectColor value="255, 0, 255, 255" />      <!-- Selection outline when inspecting -->
+ 
 <!-- EDIT MODE GRID -->
-<GridFocusPointColor value="255, 255, 255, 128" />
-<GridlineColor value="255, 255, 255, 255" />
-<GridlineBGColor value="235, 235, 255, 200" />
-<GridlineShadowColor value="0, 0, 0, 80" />
-
+<GridFocusPointColor value="255, 255, 255, 128" />      <!-- Not used -->
+<GridlineColor value="255, 255, 255, 255" />            <!-- Grid color -->
+<GridlineBGColor value="235, 235, 255, 200" />          <!-- Grid background color -->
+<GridlineShadowColor value="0, 0, 0, 80" />             <!-- Grid drop shadow -->
+ 
 <!-- PROPERTY LINES -->
-<PropertyColorAvail value="0, 0, 0, 0" />
-<PropertyColorGroup value="0, 184, 184, 102" />
-<PropertyColorOther value="255, 0, 0, 102" />
-<PropertyColorSelf value="0, 255, 0, 102" />
-<PropertyColorForSale value="255, 128, 0, 102" />
-<PropertyColorAuction value="128, 0, 255, 102" />	<!-- Match the color on the world map -->
-
-<!-- Icon Enable/Disable -->
-<IconEnabledColor value="255, 255, 255, 255"/>
-<IconDisabledColor value="147, 169, 213, 200"/>
-
+<PropertyColorAvail value="0, 0, 0, 0" />               
+<PropertyColorGroup value="0, 184, 184, 102" />         <!-- Property group owns -->
+<PropertyColorOther value="255, 0, 0, 102" />           <!-- Property others own -->
+<PropertyColorSelf value="0, 255, 0, 102" />            <!-- Property you own -->
+<PropertyColorForSale value="255, 128, 0, 102" />       <!-- Property for sale -->
+<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->
+ 
+<!-- MEDIA ICONS -->
+<IconEnabledColor value="255, 255, 255, 255"/>          <!-- Media/music icon enabled -->
+<IconDisabledColor value="147, 169, 213, 200"/>         <!-- Media/music icon disabled -->
+ 
 <!-- MINI-MAP -->
-<NetMapBackgroundColor value="0, 0, 0, 77" />
-<NetMapYouOwnAboveWater value="0, 255, 255, 255" />
-<NetMapYouOwnBelowWater value="0, 200, 200, 255" />
-<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />
-<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />
-<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />
-<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />
-
-<!-- HELP WINDOW -->
-<HelpBgColor value="200, 209, 204, 255" />
-<HelpFgColor value="0, 0, 0, 255" />
-<HelpScrollTrackColor value="183, 184, 188, 255" />
-<HelpScrollThumbColor value="80, 96, 124, 255" />
-<HelpScrollHighlightColor value="115, 132, 155, 255" />
-<HelpScrollShadowColor value="0, 0, 0, 255" />
-
+<NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
+<NetMapYouOwnAboveWater value="0, 255, 255, 255" />     <!-- Objects owned by you above water -->
+<NetMapYouOwnBelowWater value="0, 200, 200, 255" />     <!-- Objects owned by you below water -->
+<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />   <!-- Group owned objects above water -->
+<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />   <!-- Group owned objects below water -->
+<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />    <!-- Objects owned by others above water -->
+<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />    <!-- Objects owned by others below water -->
+ 
+<!-- INVENTORY -->
+<InventoryBackgroundColor value="62, 62, 62, 80"/>              <!-- Inventory floater background -->
+<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>  <!-- "loading..." -->
+<InventoryItemSuffixColor value="191, 216, 216, 255"/>          <!-- "worn", "no modify", etc -->
+<FilterBackgroundColor value="0, 0, 20, 255" />                 <!-- Inventory search background -->
+<FilterTextColor value="255, 200, 70, 255" />                   <!-- Inventory search text -->
+<InventorySearchStatusColor value="255, 255, 255, 255" />       <!-- "Searching..." -->
+ 
 <!-- MISC -->
-<AvatarNameColor value="251, 175, 93, 255" /> 		<!-- Text color of avatar nametags -->
-<FocusColor value="239, 156, 0, 255" /> 		<!-- Color of the glow around UI controls with keyboard focus -->
-<FloaterButtonImageColor value="239, 156, 0, 255" /> 	<!-- The floater buttons (like the close box) are white images that receive this color. -->
-<ButtonCautionImageColor value="255, 255,  255, 255" />	<!-- Match the caution dialog buttons to the default -->
-<HealthTextColor value="255, 255, 255, 255" />
+<AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->
+<FocusColor value="239, 156, 0, 255" />                 <!-- Color of the glow around UI controls with keyboard focus -->
+<FloaterButtonImageColor value="239, 156, 0, 255" />    <!-- The floater buttons (like the close box) are white images that receive this color. -->
+<ButtonCautionImageColor value="255, 255, 255, 255" />  <!-- Match the caution dialog buttons to the default -->
 <MapAutopilotColor value="255, 128, 0, 255" />
-<ContextSilhouetteColor value="239, 156, 0, 255" />	<!-- For "context" highlighting, i.e. pie menu -->
-<ScriptBgReadOnlyColor value="100, 100, 100, 255" />
-<ParcelTextColor value="144, 165, 208, 255" />		<!-- Parcel name on menu bar, normal state -->
-<ParcelHoverColor value="255, 255, 255, 255" />		<!-- Parcel name on menu bar, hover state -->
-<TimeTextColor value="255, 255, 255, 255" />		<!-- SL Time on menu bar -->
-<BalanceTextColor value="0, 255, 0, 255" />		<!-- Linden dollar balance on menu bar -->
-<HealthTextColor value="255, 255, 255, 255" />		<!-- Damage meter text on menu bar -->
-<GroupOverTierColor value="110, 15, 15, 255" />		<!-- Warning text in Group Info window -->
-<FilterBackgroundColor value="0, 0, 20, 255" />         <!-- Matching region of Inventory search text -->
-<FilterTextColor value="255, 200, 70, 255" />
-<InventoryItemSuffixColor value="191, 216, 216, 255" />     <!-- "worn", "no modify", etc-->
-<InventorySearchStatusColor value="255, 255, 255, 255" />
-<ConsoleBackground value="0, 0, 0, 255" />
-<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>     <!-- "loading..." in the inv -->
-<InventoryBackgroundColor value="62, 62, 62, 80"/>
-
-<!-- Alert box colors -->
-<AlertBoxColor value="62, 62, 62, 255" />               <!-- Warnings floaters, like when returning objects -->
-<AlertTextColor value="147, 169, 213, 255" />
-<AlertCautionBoxColor value="254, 209, 118, 255" />	<!-- Background color of caution alerts -->
-<AlertCautionTextColor value="0, 0, 0, 255" />		<!-- Foreground color of the special title text in caution alerts -->
-
-<!--  Multi sliders, as in the sky animation setting -->
-<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>
-<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>
-<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>
-<MultiSliderTrackColor value="30, 30, 30, 255"/>
-<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>
-<MultiSliderTriangleColor value="255, 255, 50, 255"/>
-
+<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
+<GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
+<ConsoleBackground value="0, 0, 0, 255" />              <!-- Background for inworld chat -->
+ 
 </settings>
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index 19b6013..77c8f1f 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -1,188 +1,186 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<settings version = "101">
-
-<!-- WINDOWS -->
-<TitleBarFocusColor value="50, 115, 185, 120" />	<!-- Focused window title bar highlight, no equivalent for unfocused windows -->
-<FloaterFocusBorderColor value="50, 115, 185, 75" />
-<FloaterUnfocusBorderColor value="110, 110, 110, 60" />
-<FocusBackgroundColor value="165, 180, 200, 245" />	<!-- Background color of focused floaters -->
-<DefaultBackgroundColor value="165, 180, 200, 128" />	<!-- Background color for unfocused floaters -->
-<ColorDropShadow value="0, 0, 0, 200" />		<!-- The drop shadow behind windows and menus -->
-<DefaultHighlightDark value="50, 115, 185, 255" />
-<DefaultHighlightLight value="50, 115, 185, 255" />
-<DefaultShadowDark value="50, 115, 185, 255" />
-<DefaultShadowLight value="50, 115, 185, 255" />
-
-<!-- LABELS -->
-<LabelDisabledColor value="0, 30, 60, 128" />
-<LabelSelectedColor value="255, 255, 255, 255" />
-<LabelSelectedDisabledColor value="164, 190, 237, 128" />
-<LabelTextColor value="0, 30, 60, 255" />
-
-<!-- LOGIN -->
-<LoginProgressBarBgColor value="255, 255, 255, 255" />
-<LoginProgressBarFgColor value="255, 255, 255, 255" />
-<LoginProgressBoxBorderColor value="0, 30, 60, 0" />
-<LoginProgressBoxCenterColor value="0, 0, 0, 200" />
-<LoginProgressBoxShadowColor value="0, 0, 0, 200" />
-<LoginProgressBoxTextColor value="255, 255, 255, 255"/>
-
-<!-- BUTTONS -->
-<ButtonLabelColor value="0, 30, 60, 255" /> 		<!-- Text labels for buttons, like the "OK" text -->
-<ButtonLabelSelectedColor value="255, 255, 255, 255" />
-<ButtonLabelDisabledColor value="0, 30, 60, 128" />
-<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" />
-<ButtonSelectedBgColor value="62, 62, 62, 255" />
-<ButtonSelectedColor value="255, 255, 255, 255" />
-<ButtonUnselectedBgColor value="62, 62, 62, 255" />
-<ButtonUnselectedFgColor value="255, 255, 255, 255" />
-<ButtonBorderColor value="239, 156, 0, 255" />
-<ButtonFlashBgColor value="255, 190, 62, 127" />
-<ButtonColor value="255, 255, 255, 255" /> 		<!-- Blended with button art, usually left as opaque white -->
-<ButtonImageColor value="255, 255, 255, 255" /> 	<!-- Blended with button art, usually left as opaque white -->
-
-<!-- SLIDERS -->
-<SliderDisabledThumbColor value="0, 0, 0, 255" />
-<SliderThumbCenterColor value="255, 255, 255, 255" />
-<SliderThumbOutlineColor value="37, 64, 99, 255" />
-<SliderTrackColor value="37, 64, 99, 255" />
-
-<!-- TEXTFIELDS -->
-<TextBgFocusColor value="255, 255, 255, 255" />		<!-- Text field background when receiving input (focused) -->
-<TextBgReadOnlyColor value="255, 255, 255, 140" />	<!-- Text field background when read-only -->
-<TextBgWriteableColor value="255, 255, 255, 255" />	<!-- Text field background when not receiving input (unfocused) -->
-<TextCursorColor value="0, 0, 0, 255" />
-<TextFgColor value="45, 48, 45, 255" />
-<TextFgReadOnlyColor value="0, 0, 0, 200" />
-<TextFgTentativeColor value="0, 0, 0, 128" />
-<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" />	<!-- i.e. About Land name that you don't own -->
-<TextEmbeddedItemColor value="0, 0, 128, 255" />
-<TextDefaultColor value="0, 20, 0, 255"/>
-  
-<!-- LISTBOXES -->
-<ScrollBgReadOnlyColor value="255, 255, 255, 140" />
-<ScrollBgWriteableColor value="255, 255, 255, 140" />
-<ScrollBGStripeColor value="145, 180, 220, 60" />
-<ScrollDisabledColor value="128, 128, 128, 204" />
-<ScrollSelectedBGColor value="50, 115, 185, 150" />
-<ScrollSelectedFGColor value="0, 30, 60, 255" />	<!-- Text color -->
-<ScrollUnselectedColor value="0, 30, 60, 255" />	<!-- Text color -->
-<ScrollHighlightedColor value="145, 180, 220, 128" />	<!-- Hover color -->
-<ScrollbarThumbColor value="120, 160, 200, 255" />
-<ScrollbarTrackColor value="183, 202, 220, 255" />
-
-<!-- MENUS -->
-<MenuBarBgColor value="185, 200, 220, 230" />
-<MenuBarGodBgColor value="100, 200, 130, 230" />
-<MenuNonProductionGodBgColor value="100, 200, 130, 230" />
-<MenuNonProductionBgColor value="230, 70, 70, 230" />
-<MenuDefaultBgColor value="210, 220, 230, 245" />
-<MenuItemDisabledColor value="0, 30, 60, 128" />	<!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
-<MenuItemEnabledColor value="0, 30, 60, 255" />		<!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
-<MenuItemHighlightBgColor value="50, 115, 185, 100" />
-<MenuItemHighlightFgColor value="0, 30, 60, 255" />	<!-- Highlighted menu text color; also treeview node selection highlight -->
-<MenuPopupBgColor value="197, 217, 234, 240" />
-
-<!--  PIE MENUS -->
-<PieMenuBgColor value="118, 156, 201, 230" />
-<PieMenuLineColor value="255, 255, 255, 60" />
-<PieMenuSelectedColor value="185, 200, 220, 120" />
-
-<!-- TOOLTIPS -->
-<ToolTipBgColor value="250, 255, 225, 230" />
-<ToolTipBorderColor value="171, 212, 245, 255" />
-<ToolTipTextColor value="0, 0, 0, 255" />
-
-<!-- NOTIFICATION POP-UPS -->
-<NotifyBoxColor value="170, 210, 255, 240" />
-<NotifyTextColor value="0, 30, 60, 255" />
-<NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
-<NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
-<GroupNotifyBoxColor value="170, 210, 255, 240" />
-<GroupNotifyTextColor value="0, 30, 60, 255" />
-
-<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
-<ChatHistoryBgColor value="0, 30, 80, 200" />
-<ChatHistoryTextColor value="255, 255, 255, 255" />
-<IMHistoryBgColor value="0, 30, 80, 200" />
-<IMHistoryTextColor value="255, 255, 255, 255" />
-
-<!-- IN-WORLD SELECTION -->
-<SilhouetteParentColor value="255, 255, 0, 255" />
-<SilhouetteChildColor value="32, 106, 196, 255" />
-<HighlightParentColor value="171, 212, 245, 255" />
-<HighlightChildColor value="171, 212, 245, 255" />
-<HighlightInspectColor value="255, 0, 255, 255" />
-
-<!-- EDIT MODE GRID -->
-<GridFocusPointColor value="255, 255, 255, 128" />
-<GridlineColor value="255, 255, 255, 255" />
-<GridlineBGColor value="235, 235, 255, 200" />
-<GridlineShadowColor value="0, 0, 0, 80" />
-
-<!-- PROPERTY LINES -->
-<PropertyColorAvail value="0, 0, 0, 0" />
-<PropertyColorGroup value="0, 184, 184, 102" />
-<PropertyColorOther value="255, 0, 0, 102" />
-<PropertyColorSelf value="0, 255, 0, 102" />
-<PropertyColorForSale value="255, 128, 0, 102" />
-<PropertyColorAuction value="128, 0, 255, 102" />	<!-- Match the color on the world map -->
-
-<!-- Icon Enable/Disable -->
-<IconEnabledColor value="255, 255, 255, 255"/>
-<IconDisabledColor value="147, 169, 213, 200"/>
-
-<!-- MINI-MAP -->
-<NetMapBackgroundColor value="0, 0, 0, 77" />
-<NetMapYouOwnAboveWater value="0, 255, 255, 255" />
-<NetMapYouOwnBelowWater value="0, 200, 200, 255" />
-<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />
-<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />
-<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />
-<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />
-
-<!-- HELP WINDOW -->
-<HelpBgColor value="200, 209, 204, 255" />
-<HelpFgColor value="0, 0, 0, 255" />
-<HelpScrollTrackColor value="0, 0, 0, 255" />
-<HelpScrollThumbColor value="255, 255, 255, 255" />
-<HelpScrollHighlightColor value="115, 132, 155, 255" />
-<HelpScrollShadowColor value="0, 0, 0, 255" />
-
-<!-- MISC -->
-<AvatarNameColor value="251, 175, 93, 255" /> 		<!-- Text color of avatar nametags -->
-<FocusColor value="239, 156, 0, 255" /> 		<!-- Color of the glow around UI controls with keyboard focus -->
-<FloaterButtonImageColor value="255, 255, 255, 255" /> 	<!-- The floater buttons (like the close box) are white images that receive this color. -->
-<ButtonCautionImageColor value="255, 255,  255, 255" />	<!-- Match the caution dialog buttons to the default -->
-<HealthTextColor value="255, 255, 255, 255" />
-<MapAutopilotColor value="255, 128, 0, 255" />
-<ContextSilhouetteColor value="239, 156, 0, 255" />	<!-- For "context" highlighting, i.e. pie menu -->
-<ScriptBgReadOnlyColor value="180, 180, 180, 255" />
-<ParcelTextColor value="40, 40, 90, 255" />		<!-- Parcel name on menu bar, normal state -->
-<ParcelHoverColor value="70, 70, 100, 255" />		<!-- Parcel name on menu bar, hover state -->
-<TimeTextColor value="0, 30, 60, 255" />		<!-- SL Time on menu bar -->
-<BalanceTextColor value="0, 100, 40, 255" />		<!-- Linden dollar balance on menu bar -->
-<HealthTextColor value="110, 15, 15, 255" />		<!-- Damage meter text on menu bar -->
-<GroupOverTierColor value="110, 15, 15, 255" />		<!-- Warning text in Group Info window -->
-<FilterBackgroundColor value="75, 75, 150, 180" /> <!-- Matching region of Inventory search text -->
-<FilterTextColor value="255, 200, 70, 255" />
-<InventoryItemSuffixColor value="120, 70, 55, 255"/>
-<InventorySearchStatusColor value="0, 0, 0, 255" />
-<ConsoleBackground value="0, 0, 0, 255" />
-<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>
-<InventoryBackgroundColor value="255, 255, 255, 80"/>
-
- <!-- Alert box colors -->
-<AlertBoxColor value="165, 180, 200, 245"/>
-<AlertTextColor value="0, 30, 60, 255"/>
-<AlertCautionBoxColor value="254, 209, 118, 255"/>	<!-- Background color of caution alerts -->
-<AlertCautionTextColor value="0, 0, 0, 255"/>		<!-- Foreground color of the special title text in caution alerts -->
-
-<!--  Multi sliders, as in the sky animation setting -->
-<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>
-<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>
-<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>
-<MultiSliderTrackColor value="30, 30, 30, 255"/>
-<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>
-<MultiSliderTriangleColor value="255, 255, 50, 255"/>
-</settings>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings version = "101">
+<!-- Additional comments by McCabe Maxsted -->
+ 
+<!-- WINDOWS -->
+<TitleBarFocusColor value="50, 115, 185, 120" />        <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
+<FloaterFocusBorderColor value="50, 115, 185, 75" />    <!-- Focused window border color -->
+<FloaterUnfocusBorderColor value="110, 110, 110, 60" /> <!-- Unfocused window border color -->
+<FocusBackgroundColor value="165, 180, 200, 245" />     <!-- Background color of focused windows -->
+<DefaultBackgroundColor value="165, 180, 200, 128" />   <!-- Background color for unfocused windows -->
+<ColorDropShadow value="0, 0, 0, 200" />                <!-- The drop shadow behind windows and menus -->
+<DefaultHighlightDark value="50, 115, 185, 255" />
+<DefaultHighlightLight value="50, 115, 185, 255" />     <!-- Unfocused border, bottom portion -->
+<DefaultShadowDark value="50, 115, 185, 255" />         <!-- Unfocused border, top portion -->
+<DefaultShadowLight value="50, 115, 185, 255" />        <!-- Tab area border for IMs -->
+ 
+<!-- WINDOW LABELS -->
+<LabelDisabledColor value="0, 30, 60, 128" />               <!-- Color for unfocused window titles -->
+<LabelSelectedColor value="255, 255, 255, 255" />           <!-- Color for mouseovered clickable labels, e.g. version info on the login screen -->
+<LabelSelectedDisabledColor value="164, 190, 237, 128" />
+<LabelTextColor value="0, 30, 60, 255" />                   <!-- Color for window labels and titles -->
+ 
+<!-- LOGIN -->
+<LoginProgressBarBgColor value="255, 255, 255, 255" />      <!-- Login progress bar background -->
+<LoginProgressBarFgColor value="255, 255, 255, 255" />      <!-- Login progress bar -->
+<LoginProgressBoxBorderColor value="0, 30, 60, 0" />        <!-- Login progress box border -->
+<LoginProgressBoxCenterColor value="0, 0, 0, 200" />        <!-- Login progress box background -->
+<LoginProgressBoxShadowColor value="0, 0, 0, 200" />        <!-- Login progress box shadow -->
+<LoginProgressBoxTextColor value="255, 255, 255, 255"/>     <!-- Login progress text -->
+ 
+<!-- BUTTONS -->
+<ButtonLabelColor value="0, 30, 60, 255" />                 <!-- Label text color for buttons, like the "OK" text -->
+<ButtonLabelSelectedColor value="255, 255, 255, 255" />     <!-- Label text color when button selected -->
+<ButtonLabelDisabledColor value="0, 30, 60, 128" />         <!-- Label text color when button disabled -->
+<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" /> <!-- Label text color when button disabled but selected -->
+<ButtonSelectedBgColor value="62, 62, 62, 255" />           <!-- Not used -->
+<ButtonSelectedColor value="255, 255, 255, 255" />          <!-- Not used -->
+<ButtonUnselectedBgColor value="62, 62, 62, 255" />         <!-- Not used -->
+<ButtonUnselectedFgColor value="255, 255, 255, 255" />      <!-- Not used -->
+<ButtonBorderColor value="239, 156, 0, 255" />              <!-- Not used -->
+<ButtonFlashBgColor value="255, 190, 62, 127" />            <!-- Color of tab flashing on incoming IM -->
+<ButtonColor value="255, 255, 255, 255" />                  <!-- Blended with button art, usually left as opaque white -->
+<ButtonImageColor value="255, 255, 255, 255" />             <!-- Button color override (also checkboxes and scroll arrows).
+                                                                 Blended with button art, usually left as opaque white -->
+ 
+<!-- SLIDERS, single line -->
+<SliderDisabledThumbColor value="0, 0, 0, 255" />           <!-- Not used -->
+<SliderThumbCenterColor value="255, 255, 255, 255" />       <!-- Unfocused slider thumb color -->
+<SliderThumbOutlineColor value="37, 64, 99, 255" />         <!-- Focused slider thumb color -->
+<SliderTrackColor value="37, 64, 99, 255" />                <!-- Not used -->
+ 
+<!-- SLIDERS, multi line (as in the sky editor) -->
+<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>           <!-- Not used -->       
+<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>       <!-- Not used -->   
+<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>            <!-- Not used -->
+<MultiSliderTrackColor value="30, 30, 30, 255"/>                <!-- Not used -->
+<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/> <!-- Not used -->
+<MultiSliderTriangleColor value="255, 255, 50, 255"/>           <!-- Not used -->
+ 
+<!-- TEXTFIELDS -->
+<TextBgFocusColor value="255, 255, 255, 255" />             <!-- Text field background when receiving input (focused) -->
+<TextBgReadOnlyColor value="255, 255, 255, 140" />          <!-- Text field background when read-only -->
+<TextBgWriteableColor value="255, 255, 255, 255" />         <!-- Text field background when not receiving input (unfocused) -->
+<TextCursorColor value="0, 0, 0, 255" />                    <!-- Cursor color in notecards and scripts only -->
+<TextFgColor value="48, 48, 45, 255" />                     <!-- Text color for all text entry fields; cursor color for line editors -->
+<TextFgReadOnlyColor value="0, 0, 0, 200" />                <!-- Text color in read-only fields -->
+<TextFgTentativeColor value="0, 0, 0, 128" />               <!-- Initial entry in text entry fields, e.g. "Click here to chat." -->
+<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 -->
+ 
+<!-- LISTBOXES -->
+<ScrollBgReadOnlyColor value="255, 255, 255, 140" />    <!-- Background of read only lists -->
+<ScrollBgWriteableColor value="255, 255, 255, 140" />   <!-- Background of editable lists, e.g. groups-->
+<ScrollBGStripeColor value="145, 180, 220, 60" />       <!-- Background stripes in sortable lists, e.g. Events Search -->
+<ScrollDisabledColor value="128, 128, 128, 204" />      
+<ScrollSelectedBGColor value="50, 115, 185, 150" />     <!-- Selected item in a list highlight -->
+<ScrollSelectedFGColor value="0, 30, 60, 255" />        <!-- Text color -->
+<ScrollUnselectedColor value="0, 30, 60, 255" />        <!-- Text color -->
+<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 -->
+ 
+<!-- MENUS -->
+<MenuBarBgColor value="185, 200, 220, 230" />               <!-- Menu bar background -->
+<MenuBarGodBgColor value="100, 200, 130, 230" />            <!-- Menu bar background with God Mode enabled -->
+<MenuNonProductionGodBgColor value="100, 200, 130, 230" />  <!-- Beta viewer menu bar background -->
+<MenuNonProductionBgColor value="230, 70, 70, 230" />       <!-- Beta viewer menu bar background with God Mode enabled -->
+<MenuDefaultBgColor value="210, 220, 230, 245" />           <!-- Menu background -->
+<MenuItemDisabledColor value="0, 30, 60, 128" />            <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
+<MenuItemEnabledColor value="0, 30, 60, 255" />             <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
+<MenuItemHighlightBgColor value="50, 115, 185, 100" />      <!-- Highlighted menu item background color -->
+<MenuItemHighlightFgColor value="0, 30, 60, 255" />         <!-- Highlighted menu item text color; also treeview node selection highlight -->
+<MenuPopupBgColor value="197, 217, 234, 240" />             <!-- Right-click menu background -->
+ 
+<!--  PIE MENUS -->
+<PieMenuBgColor value="118, 156, 201, 230" />           <!-- Color of pie menu -->
+<PieMenuLineColor value="255, 255, 255, 60" />          <!-- Color of pie menu slice separators -->
+<PieMenuSelectedColor value="185, 200, 220, 120" />     <!-- Color of pie menu slice when selected -->
+ 
+<!-- MENU BAR -->
+<ParcelTextColor value="40, 40, 90, 255" />		<!-- Parcel name on menu bar, normal state -->
+<ParcelHoverColor value="70, 70, 100, 255" />		<!-- Parcel name on menu bar, hover state -->
+<TimeTextColor value="0, 30, 60, 255" />		<!-- SL Time on menu bar -->
+<BalanceTextColor value="0, 100, 40, 255" />		<!-- Linden dollar balance on menu bar -->
+<HealthTextColor value="110, 15, 15, 255" />		<!-- Damage meter text on menu bar -->
+ 
+<!-- TOOLTIPS -->
+<ToolTipBgColor value="250, 255, 225, 230" />           <!-- Tool tips, i.e. "Hover Tips" -->
+<ToolTipBorderColor value="171, 212, 245, 255" />       <!-- Not used -->
+<ToolTipTextColor value="0, 0, 0, 255" />               <!-- Tool tips text color -->
+ 
+<!-- NOTIFICATION POP-UPS -->
+<NotifyBoxColor value="170, 210, 255, 240" />           <!-- Notification background, i.e. tp requests -->
+<NotifyTextColor value="0, 30, 60, 255" />              <!-- Notification text -->
+<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- Background color of caution permissions prompts -->
+<NotifyCautionWarnColor value="0, 0, 0, 255" />         <!-- Foreground color of the special title text in caution permissions prompts -->
+<GroupNotifyBoxColor value="170, 210, 255, 240" />      <!-- Group notices background -->
+<GroupNotifyTextColor value="0, 30, 60, 255" />         <!-- Group notices text -->
+ 
+<!-- ALERT BOX COLORS -->
+<AlertBoxColor value="165, 180, 200, 245" />            <!-- Alert floaters, like the warning before returning objects -->
+<AlertTextColor value="0, 30, 60, 255" />               <!-- Alert floater text -->
+<AlertCautionBoxColor value="254, 209, 118, 255" />     <!-- Background color of caution alerts -->
+<AlertCautionTextColor value="0, 0, 0, 255" />          <!-- Foreground color of the special title text in caution alerts -->
+ 
+<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
+<ChatHistoryBgColor value="0, 30, 80, 200" />           <!-- Local Chat background -->
+<ChatHistoryTextColor value="255, 255, 255, 255" />     <!-- Local Chat text -->
+<IMHistoryBgColor value="0, 30, 80, 200" />             <!-- Instant Message background -->
+<IMHistoryTextColor value="255, 255, 255, 255" />       <!-- Instant Message text -->
+ 
+<!-- IN-WORLD SELECTION -->
+<SilhouetteParentColor value="255, 255, 0, 255" />      <!-- Root prim selection outline -->
+<SilhouetteChildColor value="32, 106, 196, 255" />      <!-- Child prim selection outline -->
+<HighlightParentColor value="171, 212, 245, 255" />
+<HighlightChildColor value="171, 212, 245, 255" />
+<HighlightInspectColor value="255, 0, 255, 255" />      <!-- Selection outline when inspecting -->
+ 
+<!-- EDIT MODE GRID -->
+<GridFocusPointColor value="255, 255, 255, 128" />      <!-- Not used -->
+<GridlineColor value="255, 255, 255, 255" />            <!-- Grid color -->
+<GridlineBGColor value="235, 235, 255, 200" />          <!-- Grid background color -->
+<GridlineShadowColor value="0, 0, 0, 80" />             <!-- Grid drop shadow -->
+ 
+<!-- PROPERTY LINES -->
+<PropertyColorAvail value="0, 0, 0, 0" />               
+<PropertyColorGroup value="0, 184, 184, 102" />         <!-- Property group owns -->
+<PropertyColorOther value="255, 0, 0, 102" />           <!-- Property others own -->
+<PropertyColorSelf value="0, 255, 0, 102" />            <!-- Property you own -->
+<PropertyColorForSale value="255, 128, 0, 102" />       <!-- Property for sale -->
+<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->
+ 
+<!-- MEDIA ICONS -->
+<IconEnabledColor value="255, 255, 255, 255"/>          <!-- Media/music icon enabled -->
+<IconDisabledColor value="147, 169, 213, 200"/>         <!-- Media/music icon disabled -->
+ 
+<!-- MINI-MAP -->
+<NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
+<NetMapYouOwnAboveWater value="0, 255, 255, 255" />     <!-- Objects owned by you above water -->
+<NetMapYouOwnBelowWater value="0, 200, 200, 255" />     <!-- Objects owned by you below water -->
+<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />   <!-- Group owned objects above water -->
+<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />   <!-- Group owned objects below water -->
+<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />    <!-- Objects owned by others above water -->
+<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />    <!-- Objects owned by others below water -->
+ 
+<!-- INVENTORY -->
+<InventoryBackgroundColor value="255, 255, 255, 80"/>           <!-- Inventory floater background -->
+<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>  <!-- "loading..." -->
+<InventoryItemSuffixColor value="120, 70, 55, 255"/>            <!-- "worn", "no modify", etc -->
+<FilterBackgroundColor value="75, 75, 150, 180" />              <!-- Inventory search background -->
+<FilterTextColor value="255, 200, 70, 255" />                   <!-- Inventory search text -->
+<InventorySearchStatusColor value="0, 0, 0, 255" />             <!-- "Searching..." -->
+ 
+<!-- MISC -->
+<AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->
+<FocusColor value="239, 156, 0, 255" />                 <!-- Color of the glow around UI controls with keyboard focus -->
+<FloaterButtonImageColor value="255, 255, 255, 255" />  <!-- The floater buttons (like the close box) are white images that receive this color. -->
+<ButtonCautionImageColor value="255, 255,  255, 255" /> <!-- Match the caution dialog buttons to the default -->
+<MapAutopilotColor value="255, 128, 0, 255" />
+<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
+<GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
+<ConsoleBackground value="0, 0, 0, 255" />              <!-- Background for inworld chat -->
+ 
+</settings>
-- 
cgit v1.1


From 6c98edcb1acf61601857d222658042857e3883a0 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 24 Nov 2008 10:07:22 -0700
Subject: Switched Invite and Leave buttons in group panel.

---
 ChangeLog.txt                                                 | 6 ++++++
 linden/indra/newview/skins/default/xui/en-us/panel_groups.xml | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index ff91f69..c7afd46 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,4 +1,10 @@
 
+2008-11-23  McCabe Maxsted  <hakushakukun@gmail.com>
+
+	* linden/indra/newview/skins/default/xui/en-us/panel_groups.xml:
+	Switched Invite and Leave buttons in group panel.
+
+
 2008-11-22  McCabe Maxsted  <hakushakukun@gmail.com>
 
 	* linden\indra\newview\skins\default\colors_base.xml:
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
index 6fa099e..c47985b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
@@ -25,15 +25,15 @@
 	     label="IM/Call" left_delta="0" name="IM"
 	     tool_tip="Open Instant Message session" width="80" />
 	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-	     label="Info" name="Info" width="80" />
-	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
 	     label="Activate" name="Activate" width="80" />
 	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-	     label="Leave" name="Leave" width="80" />
+	     label="Invite..." name="Invite..." width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Info" name="Info" width="80" />
 	<button bottom_delta="-35" follows="top|right" font="SansSerif" height="22"
 	     label="Create..." name="Create" width="80" />
 	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
 	     label="Search..." name="Search..." width="80" />
 	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-	     label="Invite..." name="Invite..." width="80" />
+	     label="Leave" name="Leave" width="80" />
 </panel>
-- 
cgit v1.1


From 9b5678dce27f821ecb516e49fec288db2996d267 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 24 Nov 2008 10:57:21 -0700
Subject: Moved 'Offer Teleport' in IM to be on the left side.

---
 ChangeLog.txt                                                     | 4 ++++
 .../newview/skins/default/xui/en-us/floater_instant_message.xml   | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index c7afd46..5482255 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,10 @@
 
 2008-11-23  McCabe Maxsted  <hakushakukun@gmail.com>
 
+	* linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml:
+	Moved 'Offer Teleport' in IM to be on the left side.
+
+
 	* linden/indra/newview/skins/default/xui/en-us/panel_groups.xml:
 	Switched Invite and Leave buttons in group panel.
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index c3058c4..076598c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -36,9 +36,12 @@
 	</string>
 	<button bottom="-40" follows="left|top" height="20" label="Profile..." left="5"
 	     name="profile_callee_btn" width="80" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif"
+	     halign="center" bottom ="-40" height="20" label="Offer Teleport" left_delta="85"
+	     mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
 	<button bottom="-40" follows="left|top" halign="center" height="20"
 	     image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-	     label="Call" left_delta="85" name="start_call_btn" width="100" />
+	     label="Call" left_delta="107" name="start_call_btn" width="100" />
 	<button bottom="-40" follows="left|top" halign="center" height="20"
 	     image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
 	     label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
@@ -51,9 +54,6 @@
 		     image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
 		     name="mute_btn" tool_tip="Mute voice" width="25" />
 	</panel>
-	<button bottom_delta="0" follows="right|top" font="SansSerif"
-	     halign="center" bottom ="-40" height="20" label="Offer Teleport" right="-5"
-	     mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
 	<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
 	     bottom="30" embedded_items="false" enabled="false"
 	     follows="left|top|right|bottom" font="SansSerif" height="221" left="5"
-- 
cgit v1.1


From 0b1b08da1b7cf8f3dc43b295ec35d3f873e9a2da Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 24 Nov 2008 11:42:30 -0700
Subject: Beacons no longer persist between sessions.

That distressed users who accidentally enabled them,
since not even relogging would disable them.
---
 ChangeLog.txt                                                | 12 ++++++++++++
 linden/indra/newview/app_settings/settings.xml               |  4 ++--
 linden/indra/newview/llviewerwindow.cpp                      |  2 +-
 linden/indra/newview/pipeline.cpp                            |  2 +-
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml |  6 +++---
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 5482255..2e0689d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,18 @@
 
 2008-11-23  McCabe Maxsted  <hakushakukun@gmail.com>
 
+	* linden/indra/newview/app_settings/settings.xml:
+	Beacons no longer persist between sessions.
+	That distressed users who accidentally enabled them,
+	since not even relogging would disable them.
+	* linden/indra/newview/llviewerwindow.cpp:
+	Ditto.
+	* linden/indra/newview/pipeline.cpp:
+	Ditto.
+	* linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
+	Ditto.
+
+
 	* linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml:
 	Moved 'Offer Teleport' in IM to be on the left side.
 
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 1d2da46..1f0f240 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -664,12 +664,12 @@
         <integer>0</integer>
       </array>
     </map>
-    <key>BeaconAlwaysOn</key>
+    <key>BeaconsEnabled</key>
     <map>
       <key>Comment</key>
       <string>Beacons / highlighting always on</string>
       <key>Persist</key>
-      <integer>1</integer>
+      <integer>0</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 64c042a..2e77316 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -470,7 +470,7 @@ public:
 			ypos += y_inc;
 		}
 		// only display these messages if we are actually rendering beacons at this moment
-		if (LLPipeline::getRenderBeacons(NULL) && gSavedSettings.getBOOL("BeaconAlwaysOn"))
+		if (LLPipeline::getRenderBeacons(NULL) && gSavedSettings.getBOOL("BeaconsEnabled"))
 		{
 			if (LLPipeline::getRenderParticleBeacons(NULL))
 			{
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index f232fdf..3523635 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -2101,7 +2101,7 @@ void LLPipeline::postSort(LLCamera& camera)
 	}
 
 	// only render if the flag is set. The flag is only set if we are in edit mode or the toggle is set in the menus
-	if (gSavedSettings.getBOOL("BeaconAlwaysOn"))
+	if (gSavedSettings.getBOOL("BeaconsEnabled"))
 	{
 		if (sRenderScriptedTouchBeacons)
 		{
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 71044a0..a4f367c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -360,9 +360,9 @@
       <on_click function="View.HighlightTransparent" userdata="" />
       <on_check function="View.CheckHighlightTransparent" />
     </menu_item_check>
-    <menu_item_check name="Beacons Always On" label="Beacons Always On">
-      <on_click function="ToggleControl" userdata="BeaconAlwaysOn" />
-      <on_check control="BeaconAlwaysOn" />
+    <menu_item_check name="Beacons Always On" label="Show Beacons">
+      <on_click function="ToggleControl" userdata="BeaconsEnabled" />
+      <on_check control="BeaconsEnabled" />
     </menu_item_check>
     <menu name="Beacons" create_jump_keys="true" label="Beacons"
           opaque="true" tear_off="true">
-- 
cgit v1.1


From 80333337630aeeb8a1841f1b9b693a78aa293225 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 24 Nov 2008 12:25:18 -0700
Subject: VWR-4826 (ability to ignore friendship offers).

---
 ChangeLog.txt                                           | 4 ++++
 linden/indra/newview/skins/default/xui/en-us/notify.xml | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2e0689d..e8417fc 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,10 @@
 
 2008-11-23  McCabe Maxsted  <hakushakukun@gmail.com>
 
+	* linden/indra/newview/skins/default/xui/en-us/notify.xml:
+	VWR-4826 (ability to ignore friendship offers).
+
+
 	* linden/indra/newview/app_settings/settings.xml:
 	Beacons no longer persist between sessions.
 	That distressed users who accidentally enabled them,
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index 6af19ee..d207a74 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -579,6 +579,9 @@ to his or her location:
 		<option name="Decline">
 			Decline
 		</option>
+		<option name="Ignore">
+			Ignore
+		</option>
 	</notify>
 	<notify name="OfferFriendshipNoMessage" tip="false">
 		<message name="message">
@@ -593,6 +596,9 @@ see each other&apos;s online status.)
 		<option name="Decline">
 			Decline
 		</option>
+		<option name="Ignore">
+			Ignore
+		</option>
 	</notify>
 	<notify name="FriendshipAccepted" tip="false">
 		<message name="message">
@@ -616,6 +622,9 @@ so you can quickly IM this resident.
 		<option name="Decline">
 			Decline
 		</option>
+		<option name="Ignore">
+			Ignore
+		</option>
 	</notify>
 	<notify name="RegionRestartMinutes" tip="false">
 		<message name="message">
-- 
cgit v1.1


From 56d209c969cfbb505e6863ba7aabe76697e18afe Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 25 Nov 2008 19:01:57 -0700
Subject: Add group name to group invite window.

---
 ChangeLog.txt                                 |  8 ++++++++
 linden/indra/newview/llfloatergroupinvite.cpp | 20 +++++++++++++++++++-
 linden/indra/newview/llfloatergroupinvite.h   |  6 ++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index e8417fc..3e157d5 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,4 +1,12 @@
 
+2008-11-24  McCabe Maxsted  <hakushakukun@gmail.com>
+
+	* linden/indra/newview/llfloatergroupinvite.cpp:
+	Add group name to group invite window.
+	* linden/indra/newview/llfloatergroupinvite.h:
+	Ditto.
+
+
 2008-11-23  McCabe Maxsted  <hakushakukun@gmail.com>
 
 	* linden/indra/newview/skins/default/xui/en-us/notify.xml:
diff --git a/linden/indra/newview/llfloatergroupinvite.cpp b/linden/indra/newview/llfloatergroupinvite.cpp
index 643abf7..1644050 100644
--- a/linden/indra/newview/llfloatergroupinvite.cpp
+++ b/linden/indra/newview/llfloatergroupinvite.cpp
@@ -34,7 +34,7 @@
 #include "llfloatergroupinvite.h"
 #include "llpanelgroupinvite.h"
 
-const char FLOATER_TITLE[] = "Group Invitation";
+const char FLOATER_TITLE[] = "Invite to ";
 const LLRect FGI_RECT(0, 380, 210, 0);
 
 class LLFloaterGroupInvite::impl
@@ -132,6 +132,11 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUU
 									   group_id);
 
 		impl::sInstances[group_id] = fgi;
+		
+		// Look up the group name.
+		// The callback will insert it into the title.
+		const BOOL is_group = TRUE;
+		gCacheName->get(group_id, is_group, callbackLoadGroupName, NULL);
 
 		fgi->mImpl->mInvitePanelp->clear();
 	}
@@ -145,3 +150,16 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUU
 	fgi->open();	/*Flawfinder: ignore*/
 	fgi->mImpl->mInvitePanelp->update();
 }
+
+void LLFloaterGroupInvite::callbackLoadGroupName(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* data)
+{
+	LLFloaterGroupInvite *fgi = get_if_there(impl::sInstances, id, (LLFloaterGroupInvite*)NULL);
+
+	if (fgi)
+	{
+		// Build a new title including the group name.
+		std::ostringstream title;
+		title << FLOATER_TITLE << first;
+		fgi->setTitle(title.str());
+	}
+}
diff --git a/linden/indra/newview/llfloatergroupinvite.h b/linden/indra/newview/llfloatergroupinvite.h
index 621b5dd..96b9161 100644
--- a/linden/indra/newview/llfloatergroupinvite.h
+++ b/linden/indra/newview/llfloatergroupinvite.h
@@ -52,6 +52,12 @@ protected:
 
 	class impl;
 	impl* mImpl;
+private:
+	static void callbackLoadGroupName(const LLUUID& id, 
+				const std::string& first, 
+				const std::string& last, 
+				BOOL is_group, 
+				void* data);
 };
 
 #endif
-- 
cgit v1.1


From 04b3fb3d0d409d1adca7c01343abed185f82cc4a Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 13 Dec 2008 22:45:32 -0600
Subject: Bumped version to 1.1.0 alpha.

---
 ChangeLog.txt                           | 5 +++++
 linden/indra/llcommon/llversionviewer.h | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 3e157d5..4c601cf 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,8 @@
+2008-12-13  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* linden/indra/llcommon/llversionviewer.h:
+	Bumped version to 1.1.0 alpha.
+
 
 2008-11-24  McCabe Maxsted  <hakushakukun@gmail.com>
 
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index ab7e415..4032c5b 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -43,8 +43,8 @@ const char * const LL_VIEWER_NAME = "Second Life";
 const char * const IMP_VIEWER_NAME = "Imprudence";
 
 const S32 IMP_VERSION_MAJOR = 1;
-const S32 IMP_VERSION_MINOR = 0;
+const S32 IMP_VERSION_MINOR = 1;
 const S32 IMP_VERSION_PATCH = 0;
-const char * const IMP_VERSION_TEST = "";
+const char * const IMP_VERSION_TEST = "alpha";
 
 #endif
-- 
cgit v1.1


From abeaf736d06c57f28f19360f3be202bae75f1da2 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 13 Dec 2008 22:53:52 -0600
Subject: Version string generator now includes test label.

This is used for naming packages on Linux, among other things.
---
 ChangeLog.txt                   | 5 +++++
 linden/scripts/build_version.py | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4c601cf..724a49c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
 2008-12-13  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+	* linden/scripts/build_version.py:
+	Version string generator now includes test label.
+	This is used for naming packages on Linux, among other things.
+
+
 	* linden/indra/llcommon/llversionviewer.h:
 	Bumped version to 1.1.0 alpha.
 
diff --git a/linden/scripts/build_version.py b/linden/scripts/build_version.py
index 46587e8..3d66a65 100755
--- a/linden/scripts/build_version.py
+++ b/linden/scripts/build_version.py
@@ -26,8 +26,10 @@ def get_version(filename):
     vals['minor'] = m.group(1)
     m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', data)
     vals['patch'] = m.group(1)
+    m = re.search('const char \* const IMP_VERSION_TEST = "(.+)";', data)
+    vals['test'] = m.group(1)
 
-    return "%(major)s.%(minor)s.%(patch)s" % vals
+    return "%(major)s.%(minor)s.%(patch)s-%(test)s" % vals
 
 if __name__ == '__main__':
     import sys
-- 
cgit v1.1


From a4ecbdbba79e49ce5653101c6c71f8b5df7e0fc5 Mon Sep 17 00:00:00 2001
From: Anders Arnholm
Date: Mon, 15 Dec 2008 14:25:24 +0100
Subject: ..

---
 linden/indra/llcommon/llversionviewer.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index ab7e415..08ec232 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -43,8 +43,8 @@ const char * const LL_VIEWER_NAME = "Second Life";
 const char * const IMP_VIEWER_NAME = "Imprudence";
 
 const S32 IMP_VERSION_MAJOR = 1;
-const S32 IMP_VERSION_MINOR = 0;
+const S32 IMP_VERSION_MINOR = 1;
 const S32 IMP_VERSION_PATCH = 0;
-const char * const IMP_VERSION_TEST = "";
+const char * const IMP_VERSION_TEST = "OpenAL-1";
 
 #endif
-- 
cgit v1.1


From 95fd362ec7b71ce216a5c305e62e2f2c9994e564 Mon Sep 17 00:00:00 2001
From: Anders Arnholm
Date: Mon, 15 Dec 2008 14:40:56 +0100
Subject: Not openal branch next branch.

---
 linden/indra/llcommon/llversionviewer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 08ec232..4032c5b 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -45,6 +45,6 @@ const char * const IMP_VIEWER_NAME = "Imprudence";
 const S32 IMP_VERSION_MAJOR = 1;
 const S32 IMP_VERSION_MINOR = 1;
 const S32 IMP_VERSION_PATCH = 0;
-const char * const IMP_VERSION_TEST = "OpenAL-1";
+const char * const IMP_VERSION_TEST = "alpha";
 
 #endif
-- 
cgit v1.1