From c782860f23e11dc46af043ac16d4209b0853bbb6 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 22 Nov 2008 13:18:13 -0700
Subject: Friends dots show as yellow and color can be set in colors.xml

---
 linden/indra/newview/skins/default/colors_base.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linden/indra/newview/skins/default')

diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 3b85efa..a3e8d62 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -140,6 +140,8 @@
 <NetMapGroupOwnBelowWater value="200, 0, 200, 255" />
 <NetMapOtherOwnAboveWater value="60, 60, 60, 255" />
 <NetMapOtherOwnBelowWater value="30, 30, 30, 255" />
+<NetMapGlyphColorAvatar value="0, 255, 0, 255" />       <!-- Also the color of avatar glyphs on the map -->
+<NetMapGlyphColorFriend value="255, 255, 0, 255" />
 
 <!-- HELP WINDOW -->
 <HelpBgColor value="200, 209, 204, 255" />
-- 
cgit v1.1


From 54a503c06a00939c38dc72321cdbe4b78c80cf89 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 1 Dec 2008 00:45:11 -0700
Subject: Added 'Select Only Copyable' option in the Tools menu

---
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'linden/indra/newview/skins/default')

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..aeef31a 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
@@ -608,6 +608,12 @@
                 userdata="movable" />
       <on_check control="SelectMovableOnly" />
     </menu_item_check>
+    <menu_item_check name="Select Only Copyable Objects"
+                     label="Select Only Copyable Objects">
+      <on_click function="Tools.SelectOnlyCopyableObjects"
+                userdata="copyable" />
+      <on_check control="SelectCopyableOnly" />
+    </menu_item_check>
     <menu_item_check name="Select By Surrounding"
                      label="Select By Surrounding">
       <on_click function="Tools.SelectBySurrounding"
-- 
cgit v1.1


From 6cf3cba7fd2cfe4e25522428e456360d414b89a5 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 5 Dec 2008 05:21:06 -0700
Subject: Rebranded login menu. [#23]

---
 .../newview/skins/default/xui/en-us/menu_login.xml | 66 +++++++++++-----------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to 'linden/indra/newview/skins/default')

diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index d7ff80b..8d06657 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
-     height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true"
-     tear_off="false" width="802">
-	<menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
-	     height="263" label="File" left="0" mouse_opaque="false" name="File"
-	     opaque="true" tear_off="false" width="243">
-		<menu_item_call bottom="-29" enabled="true" height="19" label="Quit" left="0"
-		     mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
-			<on_click function="File.Quit" userdata="" />
-		</menu_item_call>
-	</menu>
-	<menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
-	     height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"
-	     opaque="true" tear_off="false" width="153">
-		<menu_item_call bottom="-29" enabled="true" height="19" label="Preferences..." left="0"
-		     mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">
-			<on_click function="ShowFloater" userdata="preferences" />
-		</menu_item_call>
-	</menu>
-	<menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
-	     height="317" label="Help" left="80" mouse_opaque="false" name="Help"
-	     opaque="true" tear_off="false" width="166">
-		<menu_item_call bottom="-29" enabled="true" height="19" label="Second Life Help" left="0"
-		     mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
-			<on_click function="ShowFloater" userdata="help f1" />
-		</menu_item_call>
-		<menu_item_call bottom="-48" enabled="true" height="19" label="About Second Life..." left="0"
-		     mouse_opaque="true" name="About Second Life..." width="166">
-			<on_click function="ShowFloater" userdata="about" />
-		</menu_item_call>
-	</menu>
-</menu_bar>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
+     height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true"
+     tear_off="false" width="802">
+	<menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
+	     height="263" label="File" left="0" mouse_opaque="false" name="File"
+	     opaque="true" tear_off="false" width="243">
+		<menu_item_call bottom="-29" enabled="true" height="19" label="Quit" left="0"
+		     mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
+			<on_click function="File.Quit" userdata="" />
+		</menu_item_call>
+	</menu>
+	<menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
+	     height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"
+	     opaque="true" tear_off="false" width="153">
+		<menu_item_call bottom="-29" enabled="true" height="19" label="Preferences..." left="0"
+		     mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">
+			<on_click function="ShowFloater" userdata="preferences" />
+		</menu_item_call>
+	</menu>
+	<menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
+	     height="317" label="Help" left="80" mouse_opaque="false" name="Help"
+	     opaque="true" tear_off="false" width="166">
+		<menu_item_call bottom="-29" enabled="true" height="19" label="Viewer Help" left="0"
+		     mouse_opaque="true" name="Viewer Help" shortcut="F1" width="166">
+			<on_click function="ShowFloater" userdata="help f1" />
+		</menu_item_call>
+		<menu_item_call bottom="-48" enabled="true" height="19" label="About Imprudence..." left="0"
+		     mouse_opaque="true" name="About Imprudence..." width="166">
+			<on_click function="ShowFloater" userdata="about" />
+		</menu_item_call>
+	</menu>
+</menu_bar>
-- 
cgit v1.1


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.

---
 linden/indra/newview/skins/default/colors_base.xml | 325 ++++++++++-----------
 1 file changed, 161 insertions(+), 164 deletions(-)

(limited to 'linden/indra/newview/skins/default')

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>
-- 
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.

---
 linden/indra/newview/skins/default/xui/en-us/panel_groups.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'linden/indra/newview/skins/default')

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.

---
 .../newview/skins/default/xui/en-us/floater_instant_message.xml   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'linden/indra/newview/skins/default')

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.
---
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'linden/indra/newview/skins/default')

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).

---
 linden/indra/newview/skins/default/xui/en-us/notify.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'linden/indra/newview/skins/default')

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 5043867f05a39c1f634a1e4c0f930de4efa16c72 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 18 Oct 2008 17:31:02 -0700
Subject: Added Home button functionality to the web browser.

---
 .../newview/skins/default/xui/en-us/floater_media_browser.xml     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview/skins/default')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index 5b2d310..077ab23 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
@@ -12,9 +12,11 @@
 			<button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload"
 			     left_delta="65" name="reload" width="70" />
 			<combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20"
-			     left_delta="75" max_chars="255" name="address" width="280" />
+			     left_delta="75" max_chars="235" name="address" width="225" />
 			<button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go"
-			     left_delta="285" name="go" width="55" />
+			     left_delta="230" name="go" width="55" />
+			<button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home"
+			     left_delta="60" name="home" width="55" />
 		</layout_panel>
 		<layout_panel auto_resize="false" bottom="0" height="20" left="0"
 		     name="parcel_owner_controls" user_resize="false" width="540">
@@ -30,6 +32,8 @@
 			<check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20"
 			     label="Always open in my web browser" left_delta="190" name="open_always"
 			     width="200" />
+			<button bottom="5" enabled="false" follows="bottom|right" height="20" label="Set Home To Here"
+			     left="-265" name="set_home" width="155" />
 			<button bottom="5" follows="bottom|right" height="20" label="Close" left="-70"
 			     name="close" width="70" />
 		</layout_panel>
-- 
cgit v1.1


From 109e2a25f8a71dae79fba7b5a58b9f38fcbeb76d Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 18 Oct 2008 20:46:26 -0700
Subject: Added menu option for inworld browser.

---
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'linden/indra/newview/skins/default')

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 a4f367c..67be436 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
@@ -271,6 +271,11 @@
       <on_enable function="View.EnableLastChatter" />
     </menu_item_call>
     <menu_item_separator />
+    <menu_item_call name="Web Browser" label="Web Browser"
+                    shortcut="control|B">
+      <on_click function="ShowFloater" userdata="inworld browser" />
+    </menu_item_call>
+    <menu_item_separator />
     <menu_item_check name="Toolbar" label="Toolbar">
       <on_click function="ShowFloater" userdata="toolbar" />
       <on_check function="FloaterVisible" userdata="toolbar" />
-- 
cgit v1.1