aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default
diff options
context:
space:
mode:
authorJacek Antonelli2008-12-17 01:24:37 -0600
committerJacek Antonelli2008-12-17 01:24:37 -0600
commita3b0b6c299f791b3d8132d36a3d4c1790aea86b1 (patch)
tree07d9080e0f71845fdf07f666907422b2fe6c4a3f /linden/indra/newview/skins/default
parentUse NType to find inventory icon name (part 2 of 2). (diff)
parentVWR-1582: Local ruler mode wrong for linked objects. (diff)
downloadmeta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.zip
meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.tar.gz
meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.tar.bz2
meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.tar.xz
Merge 1.1.0 alpha into quickfilter
Diffstat (limited to 'linden/indra/newview/skins/default')
-rw-r--r--linden/indra/newview/skins/default/colors_base.xml319
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_login.xml66
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml17
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notify.xml9
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_groups.xml8
7 files changed, 233 insertions, 202 deletions
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 3b85efa..ff3d53e 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -1,146 +1,180 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<settings version = "101"> 2<settings version = "101">
3 3<!-- Additional comments by McCabe Maxsted -->
4
4<!-- WINDOWS --> 5<!-- WINDOWS -->
5<TitleBarFocusColor value="255, 255, 255, 30" /> <!-- Focused window title bar highlight, no equivalent for unfocused windows --> 6<TitleBarFocusColor value="255, 255, 255, 30" /> <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
6<FloaterFocusBorderColor value="0, 0, 0, 80" /> 7<FloaterFocusBorderColor value="0, 0, 0, 80" /> <!-- Focused window border color -->
7<FloaterUnfocusBorderColor value="0, 0, 0, 80" /> 8<FloaterUnfocusBorderColor value="0, 0, 0, 80" /> <!-- Unfocused window border color -->
8<FocusBackgroundColor value="62, 62, 62, 255" /> <!-- Background color of focused floaters --> 9<FocusBackgroundColor value="62, 62, 62, 255" /> <!-- Background color of focused windows -->
9<DefaultBackgroundColor value="62, 62, 62, 140" /> <!-- Background color for unfocused floaters --> 10<DefaultBackgroundColor value="62, 62, 62, 140" /> <!-- Background color for unfocused windows -->
10<ColorDropShadow value="0, 0, 0, 200" /> <!-- The drop shadow behind windows and menus --> 11<ColorDropShadow value="0, 0, 0, 200" /> <!-- The drop shadow behind windows and menus -->
11<DefaultHighlightDark value="26, 26, 26, 255" /> 12<DefaultHighlightDark value="26, 26, 26, 255" />
12<DefaultHighlightLight value="115, 132, 155, 255" /> 13<DefaultHighlightLight value="115, 132, 155, 255" /> <!-- Unfocused border, bottom portion -->
13<DefaultShadowDark value="26, 26, 26, 255" /> 14<DefaultShadowDark value="26, 26, 26, 255" /> <!-- Unfocused border, top portion -->
14<DefaultShadowLight value="0, 0, 0, 255" /> 15<DefaultShadowLight value="0, 0, 0, 255" /> <!-- Tab area border for IMs -->
15 16
16<!-- LABELS --> 17<!-- WINDOW LABELS -->
17<LabelDisabledColor value="147, 169, 213, 77" /> 18<LabelDisabledColor value="147, 169, 213, 77" /> <!-- Color for unfocused window titles -->
18<LabelSelectedColor value="255, 255, 255, 255" /> 19<LabelSelectedColor value="255, 255, 255, 255" /> <!-- Color for mouseovered clickable labels, e.g. version info on the login screen -->
19<LabelSelectedDisabledColor value="164, 190, 237, 128" /> 20<LabelSelectedDisabledColor value="164, 190, 237, 128" />
20<LabelTextColor value="147, 169, 213, 255" /> 21<LabelTextColor value="147, 169, 213, 255" /> <!-- Color for window labels and titles -->
21 22
22<!-- LOGIN --> 23<!-- LOGIN -->
23<LoginProgressBarBgColor value="255, 255, 255, 255" /> 24<LoginProgressBarBgColor value="255, 255, 255, 255" /> <!-- Login progress bar background -->
24<LoginProgressBarFgColor value="255, 255, 255, 255" /> 25<LoginProgressBarFgColor value="255, 255, 255, 255" /> <!-- Login progress bar -->
25<LoginProgressBoxBorderColor value="0, 30, 60, 0" /> 26<LoginProgressBoxBorderColor value="0, 30, 60, 0" /> <!-- Login progress box border -->
26<LoginProgressBoxCenterColor value="0, 0, 0, 200" /> 27<LoginProgressBoxCenterColor value="0, 0, 0, 200" /> <!-- Login progress box background -->
27<LoginProgressBoxShadowColor value="0, 0, 0, 200" /> 28<LoginProgressBoxShadowColor value="0, 0, 0, 200" /> <!-- Login progress box shadow -->
28<LoginProgressBoxTextColor value="255, 255, 255, 255"/> 29<LoginProgressBoxTextColor value="255, 255, 255, 255"/> <!-- Login progress text -->
29 30
30<!-- BUTTONS --> 31<!-- BUTTONS -->
31<ButtonLabelColor value="220, 220, 220, 255" /> <!-- Text labels for buttons, like the "OK" text --> 32<ButtonLabelColor value="220, 220, 220, 255" /> <!-- Label text color for buttons, like the "OK" text -->
32<ButtonLabelSelectedColor value="220, 220, 220, 255" /> 33<ButtonLabelSelectedColor value="220, 220, 220, 255" /> <!-- Label text color when button selected -->
33<ButtonLabelDisabledColor value="147, 169, 213, 200" /> 34<ButtonLabelDisabledColor value="147, 169, 213, 200" /> <!-- Label text color when button disabled -->
34<ButtonLabelSelectedDisabledColor value="164, 190, 237, 200" /> 35<ButtonLabelSelectedDisabledColor value="164, 190, 237, 200" /> <!-- Label text color when button disabled but selected -->
35<ButtonSelectedBgColor value="62, 62, 62, 255" /> 36<ButtonSelectedBgColor value="62, 62, 62, 255" /> <!-- Not used -->
36<ButtonSelectedColor value="255, 255, 255, 255" /> 37<ButtonSelectedColor value="255, 255, 255, 255" /> <!-- Not used -->
37<ButtonUnselectedBgColor value="62, 62, 62, 255" /> 38<ButtonUnselectedBgColor value="62, 62, 62, 255" /> <!-- Not used -->
38<ButtonUnselectedFgColor value="255, 255, 255, 255" /> 39<ButtonUnselectedFgColor value="255, 255, 255, 255" /> <!-- Not used -->
39<ButtonBorderColor value="239, 156, 0, 255" /> 40<ButtonBorderColor value="239, 156, 0, 255" /> <!-- Not used -->
40<ButtonFlashBgColor value="255, 190, 62, 127" /> 41<ButtonFlashBgColor value="255, 190, 62, 127" /> <!-- Color of tab flashing on incoming IM -->
41<ButtonColor value="255, 255, 255, 255" /> <!-- Blended with button art, usually left as opaque white --> 42<ButtonColor value="255, 255, 255, 255" /> <!-- Blended with button art, usually left as opaque white -->
42<ButtonImageColor value="255, 255, 255, 255" /> <!-- Blended with button art, usually left as opaque white --> 43<ButtonImageColor value="255, 255, 255, 255" /> <!-- Button color override (also checkboxes and scroll arrows).
43 44 Blended with button art, usually left as opaque white -->
44<!-- SLIDERS --> 45
45<SliderDisabledThumbColor value="0, 0, 0, 255" /> 46<!-- SLIDERS, single line -->
46<SliderThumbCenterColor value="200, 200, 200, 255" /> 47<SliderDisabledThumbColor value="0, 0, 0, 255" /> <!-- Not used -->
47<SliderThumbOutlineColor value="255, 255, 255, 255" /> 48<SliderThumbCenterColor value="200, 200, 200, 255" /> <!-- Unfocused slider thumb color -->
48<SliderTrackColor value="255, 255, 255, 255" /> 49<SliderThumbOutlineColor value="255, 255, 255, 255" /> <!-- Focused slider thumb color -->
49 50<SliderTrackColor value="255, 255, 255, 255" /> <!-- Not used -->
51
52<!-- SLIDERS, multi line (as in the sky editor) -->
53<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/> <!-- Not used -->
54<MultiSliderThumbCenterColor value="183, 184, 188, 255"/> <!-- Not used -->
55<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/> <!-- Not used -->
56<MultiSliderTrackColor value="30, 30, 30, 255"/> <!-- Not used -->
57<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/> <!-- Not used -->
58<MultiSliderTriangleColor value="255, 255, 50, 255"/> <!-- Not used -->
59
50<!-- TEXTFIELDS --> 60<!-- TEXTFIELDS -->
51<TextBgFocusColor value="200, 209, 204, 255" /> <!-- Text field background when receiving input (focused) --> 61<TextBgFocusColor value="200, 209, 204, 255" /> <!-- Text field background when receiving input (focused) -->
52<TextBgReadOnlyColor value="62, 62, 62, 160" /> <!-- Text field background when read-only --> 62<TextBgReadOnlyColor value="62, 62, 62, 160" /> <!-- Text field background when read-only -->
53<TextBgWriteableColor value="200, 209, 204, 230" /> <!-- Text field background when not receiving input (unfocused) --> 63<TextBgWriteableColor value="200, 209, 204, 230" /> <!-- Text field background when not receiving input (unfocused) -->
54<TextCursorColor value="0, 0, 0, 255" /> 64<TextCursorColor value="0, 0, 0, 255" /> <!-- Cursor color in notecards and scripts only -->
55<TextFgColor value="0, 0, 0, 255" /> 65<TextFgColor value="0, 0, 0, 255" /> <!-- Text color for all text entry fields; cursor color for line editors -->
56<TextFgReadOnlyColor value="255, 255, 255, 200" /> 66<TextFgReadOnlyColor value="255, 255, 255, 200" /> <!-- Text color in read-only fields -->
57<TextFgTentativeColor value="0, 0, 0, 128" /> 67<TextFgTentativeColor value="0, 0, 0, 128" /> <!-- Initial entry in text entry fields, e.g. "Click here to chat." -->
58<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- i.e. About Land name that you don't own --> 68<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- Text of read-only items embedded in notecards -->
59<TextEmbeddedItemColor value="0, 0, 128, 255" /> 69<TextEmbeddedItemColor value="0, 0, 128, 255" /> <!-- Text of items embedded in notecards -->
60<TextDefaultColor value="0, 20, 0, 255"/> 70<TextDefaultColor value="0, 20, 0, 255"/> <!-- Non-keyword text in the script editor -->
61 71<ScriptBgReadOnlyColor value="100, 100, 100, 255" /> <!-- Not used -->
72
62<!-- LISTBOXES --> 73<!-- LISTBOXES -->
63<ScrollBgReadOnlyColor value="200, 209, 204, 255" /> 74<ScrollBgReadOnlyColor value="200, 209, 204, 255" /> <!-- Background of read only lists -->
64<ScrollBgWriteableColor value="200, 209, 204, 255" /> 75<ScrollBgWriteableColor value="200, 209, 204, 255" /> <!-- Background of editable lists, e.g. groups-->
65<ScrollBGStripeColor value="100, 100, 100, 40" /> 76<ScrollBGStripeColor value="100, 100, 100, 40" /> <!-- Background stripes in sortable lists, e.g. Events Search -->
66<ScrollDisabledColor value="128, 128, 128, 204" /> 77<ScrollDisabledColor value="128, 128, 128, 204" />
67<ScrollSelectedBGColor value="100, 100, 188, 150" /> 78<ScrollSelectedBGColor value="100, 100, 188, 150" /> <!-- Selected item in a list highlight -->
68<ScrollSelectedFGColor value="0, 0, 0, 204" /> <!-- Text color --> 79<ScrollSelectedFGColor value="0, 0, 0, 204" /> <!-- Text color -->
69<ScrollUnselectedColor value="0, 0, 0, 204" /> <!-- Text color --> 80<ScrollUnselectedColor value="0, 0, 0, 204" /> <!-- Text color -->
70<ScrollHighlightedColor value="183, 184, 188, 128" /> <!-- Hover color --> 81<ScrollHighlightedColor value="183, 184, 188, 128" /> <!-- Hover color -->
71<ScrollbarThumbColor value="60, 76, 124, 255" /> <!-- Scroll bar--> 82<ScrollbarThumbColor value="60, 76, 124, 255" /> <!-- Scroll bar -->
72<ScrollbarTrackColor value="153, 154, 158, 255" /> <!-- Scroll bar background--> 83<ScrollbarTrackColor value="153, 154, 158, 255" /> <!-- Scroll bar background -->
73 84
74<!-- MENUS --> 85<!-- MENUS -->
75<MenuBarBgColor value="62, 62, 62, 255" /> 86<MenuBarBgColor value="62, 62, 62, 255" /> <!-- Menu bar background -->
76<MenuBarGodBgColor value="62, 128, 62, 255" /> 87<MenuBarGodBgColor value="62, 128, 62, 255" /> <!-- Menu bar background with God Mode enabled -->
77<MenuNonProductionGodBgColor value="0, 128, 0, 255" /> 88<MenuNonProductionGodBgColor value="0, 128, 0, 255" /> <!-- Beta viewer menu bar background -->
78<MenuNonProductionBgColor value="128, 0, 0, 255" /> 89<MenuNonProductionBgColor value="128, 0, 0, 255" /> <!-- Beta viewer menu bar background with God Mode enabled -->
79<MenuDefaultBgColor value="0, 0, 0, 255" /> 90<MenuDefaultBgColor value="0, 0, 0, 255" /> <!-- Menu background -->
80<MenuItemDisabledColor value="133, 133, 164, 128" /> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) --> 91<MenuItemDisabledColor value="133, 133, 164, 128" /> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
81<MenuItemEnabledColor value="255, 255, 255, 255" /> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) --> 92<MenuItemEnabledColor value="255, 255, 255, 255" /> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
82<MenuItemHighlightBgColor value="183, 184, 188, 100" /> 93<MenuItemHighlightBgColor value="183, 184, 188, 100" /> <!-- Highlighted menu item background color -->
83<MenuItemHighlightFgColor value="255, 255, 255, 255" /> <!-- Highlighted menu text color; also treeview node selection highlight --> 94<MenuItemHighlightFgColor value="255, 255, 255, 255" /> <!-- Highlighted menu item text color; also treeview node selection highlight -->
84<MenuPopupBgColor value="0, 0, 0, 255" /> 95<MenuPopupBgColor value="0, 0, 0, 255" /> <!-- Right-click menu background -->
85 96
86<!-- PIE MENUS --> 97<!-- PIE MENUS -->
87<PieMenuBgColor value="62, 62, 62, 150" /> 98<PieMenuBgColor value="62, 62, 62, 150" /> <!-- Color of pie menu -->
88<PieMenuLineColor value="0, 0, 0, 128" /> 99<PieMenuLineColor value="0, 0, 0, 128" /> <!-- Color of pie menu slice separators -->
89<PieMenuSelectedColor value="183, 184, 188, 77" /> 100<PieMenuSelectedColor value="183, 184, 188, 77" /> <!-- Color of pie menu slice when selected -->
90 101
102<!-- MENU BAR -->
103<ParcelTextColor value="144, 165, 208, 255" /> <!-- Parcel name on menu bar, normal state -->
104<ParcelHoverColor value="255, 255, 255, 255" /> <!-- Parcel name on menu bar, hover state -->
105<TimeTextColor value="255, 255, 255, 255" /> <!-- SL Time on menu bar -->
106<BalanceTextColor value="0, 255, 0, 255" /> <!-- Linden dollar balance on menu bar -->
107<HealthTextColor value="255, 255, 255, 255" /> <!-- Damage meter text on menu bar -->
108
91<!-- TOOLTIPS --> 109<!-- TOOLTIPS -->
92<ToolTipBgColor value="183, 184, 188, 200" /> 110<ToolTipBgColor value="183, 184, 188, 200" /> <!-- Tool tips, i.e. "Hover Tips" -->
93<ToolTipBorderColor value="171, 212, 245, 255" /> 111<ToolTipBorderColor value="171, 212, 245, 255" /> <!-- Not used -->
94<ToolTipTextColor value="0, 0, 0, 255" /> 112<ToolTipTextColor value="0, 0, 0, 255" /> <!-- Tool tips text color -->
95 113
96<!-- NOTIFICATION POP-UPS --> 114<!-- NOTIFICATION POP-UPS -->
97<NotifyBoxColor value="70, 170, 255, 255" /> 115<NotifyBoxColor value="70, 170, 255, 255" /> <!-- Notification background, i.e. tp requests -->
98<NotifyTextColor value="0, 0, 0, 255" /> 116<NotifyTextColor value="0, 0, 0, 255" /> <!-- Notification text -->
99<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- the background color of caution permissions prompts --> 117<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- Background color of caution permissions prompts -->
100<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- the foreground color of the special title text in caution permissions prompts --> 118<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- Foreground color of the special title text in caution permissions prompts -->
101<GroupNotifyBoxColor value="70, 170, 255, 255" /> 119<GroupNotifyBoxColor value="70, 170, 255, 255" /> <!-- Group notices background -->
102<GroupNotifyTextColor value="0, 30, 60, 255" /> 120<GroupNotifyTextColor value="0, 30, 60, 255" /> <!-- Group notices text -->
103 121
122<!-- ALERT BOX COLORS -->
123<AlertBoxColor value="62, 62, 62, 255" /> <!-- Alert floaters, like the warning before returning objects -->
124<AlertTextColor value="147, 169, 213, 255" /> <!-- Alert floater text -->
125<AlertCautionBoxColor value="254, 209, 118, 255" /> <!-- Background color of caution alerts -->
126<AlertCautionTextColor value="0, 0, 0, 255" /> <!-- Foreground color of the special title text in caution alerts -->
127
104<!-- CHAT AND IM HISTORY TEXTBOX COLORS --> 128<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
105<ChatHistoryBgColor value="0, 0, 0, 0" /> 129<ChatHistoryBgColor value="0, 0, 0, 0" /> <!-- Local Chat background -->
106<ChatHistoryTextColor value="255, 255, 255, 255" /> 130<ChatHistoryTextColor value="255, 255, 255, 255" /> <!-- Local Chat text -->
107<IMHistoryBgColor value="0, 30, 80, 200" /> 131<IMHistoryBgColor value="0, 30, 80, 200" /> <!-- Instant Message background -->
108<IMHistoryTextColor value="255, 255, 255, 255" /> 132<IMHistoryTextColor value="255, 255, 255, 255" /> <!-- Instant Message text -->
109 133
110<!-- IN-WORLD SELECTION --> 134<!-- IN-WORLD SELECTION -->
111<SilhouetteParentColor value="255, 255, 0, 255" /> 135<SilhouetteParentColor value="255, 255, 0, 255" /> <!-- Root prim selection outline -->
112<SilhouetteChildColor value="32, 106, 196, 255" /> 136<SilhouetteChildColor value="32, 106, 196, 255" /> <!-- Child prim selection outline -->
113<HighlightParentColor value="171, 212, 245, 255" /> 137<HighlightParentColor value="171, 212, 245, 255" />
114<HighlightChildColor value="171, 212, 245, 255" /> 138<HighlightChildColor value="171, 212, 245, 255" />
115<HighlightInspectColor value="255, 0, 255, 255" /> 139<HighlightInspectColor value="255, 0, 255, 255" /> <!-- Selection outline when inspecting -->
116 140
117<!-- EDIT MODE GRID --> 141<!-- EDIT MODE GRID -->
118<GridFocusPointColor value="255, 255, 255, 128" /> 142<GridFocusPointColor value="255, 255, 255, 128" /> <!-- Not used -->
119<GridlineColor value="255, 255, 255, 255" /> 143<GridlineColor value="255, 255, 255, 255" /> <!-- Grid color -->
120<GridlineBGColor value="235, 235, 255, 200" /> 144<GridlineBGColor value="235, 235, 255, 200" /> <!-- Grid background color -->
121<GridlineShadowColor value="0, 0, 0, 80" /> 145<GridlineShadowColor value="0, 0, 0, 80" /> <!-- Grid drop shadow -->
122 146
123<!-- PROPERTY LINES --> 147<!-- PROPERTY LINES -->
124<PropertyColorAvail value="0, 0, 0, 0" /> 148<PropertyColorAvail value="0, 0, 0, 0" />
125<PropertyColorGroup value="0, 184, 184, 102" /> 149<PropertyColorGroup value="0, 184, 184, 102" /> <!-- Property group owns -->
126<PropertyColorOther value="255, 0, 0, 102" /> 150<PropertyColorOther value="255, 0, 0, 102" /> <!-- Property others own -->
127<PropertyColorSelf value="0, 255, 0, 102" /> 151<PropertyColorSelf value="0, 255, 0, 102" /> <!-- Property you own -->
128<PropertyColorForSale value="255, 128, 0, 102" /> 152<PropertyColorForSale value="255, 128, 0, 102" /> <!-- Property for sale -->
129<PropertyColorAuction value="128, 0, 255, 102" /> <!-- Match the color on the world map --> 153<PropertyColorAuction value="128, 0, 255, 102" /> <!-- Match the color on the world map -->
130 154
131<!-- Icon Enable/Disable --> 155<!-- MEDIA ICONS -->
132<IconEnabledColor value="255, 255, 255, 255"/> 156<IconEnabledColor value="255, 255, 255, 255"/> <!-- Media/music icon enabled -->
133<IconDisabledColor value="147, 169, 213, 200"/> 157<IconDisabledColor value="147, 169, 213, 200"/> <!-- Media/music icon disabled -->
134 158
135<!-- MINI-MAP --> 159<!-- MINI-MAP -->
136<NetMapBackgroundColor value="0, 0, 0, 77" /> 160<NetMapBackgroundColor value="0, 0, 0, 77" /> <!-- Mini-map floater background -->
137<NetMapYouOwnAboveWater value="0, 255, 255, 255" /> 161<NetMapYouOwnAboveWater value="0, 255, 255, 255" /> <!-- Objects owned by you above water -->
138<NetMapYouOwnBelowWater value="0, 200, 200, 255" /> 162<NetMapYouOwnBelowWater value="0, 200, 200, 255" /> <!-- Objects owned by you below water -->
139<NetMapGroupOwnAboveWater value="255, 0, 255, 255" /> 163<NetMapGroupOwnAboveWater value="255, 0, 255, 255" /> <!-- Group owned objects above water -->
140<NetMapGroupOwnBelowWater value="200, 0, 200, 255" /> 164<NetMapGroupOwnBelowWater value="200, 0, 200, 255" /> <!-- Group owned objects below water -->
141<NetMapOtherOwnAboveWater value="60, 60, 60, 255" /> 165<NetMapOtherOwnAboveWater value="60, 60, 60, 255" /> <!-- Objects owned by others above water -->
142<NetMapOtherOwnBelowWater value="30, 30, 30, 255" /> 166<NetMapOtherOwnBelowWater value="30, 30, 30, 255" /> <!-- Objects owned by others below water -->
143 167<NetMapGlyphColorAvatar value="0, 255, 0, 255" /> <!-- Also the color of avatar glyphs on the map -->
168<NetMapGlyphColorFriend value="255, 255, 0, 255" />
169
170<!-- INVENTORY -->
171<InventoryBackgroundColor value="62, 62, 62, 80"/> <!-- Inventory floater background -->
172<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/> <!-- "loading..." -->
173<InventoryItemSuffixColor value="191, 216, 216, 255"/> <!-- "worn", "no modify", etc -->
174<FilterBackgroundColor value="0, 0, 20, 255" /> <!-- Inventory search background -->
175<FilterTextColor value="255, 200, 70, 255" /> <!-- Inventory search text -->
176<InventorySearchStatusColor value="255, 255, 255, 255" /> <!-- "Searching..." -->
177
144<!-- HELP WINDOW --> 178<!-- HELP WINDOW -->
145<HelpBgColor value="200, 209, 204, 255" /> 179<HelpBgColor value="200, 209, 204, 255" />
146<HelpFgColor value="0, 0, 0, 255" /> 180<HelpFgColor value="0, 0, 0, 255" />
@@ -150,40 +184,13 @@
150<HelpScrollShadowColor value="0, 0, 0, 255" /> 184<HelpScrollShadowColor value="0, 0, 0, 255" />
151 185
152<!-- MISC --> 186<!-- MISC -->
153<AvatarNameColor value="251, 175, 93, 255" /> <!-- Text color of avatar nametags --> 187<AvatarNameColor value="251, 175, 93, 255" /> <!-- Text color of avatar nametags -->
154<FocusColor value="239, 156, 0, 255" /> <!-- Color of the glow around UI controls with keyboard focus --> 188<FocusColor value="239, 156, 0, 255" /> <!-- Color of the glow around UI controls with keyboard focus -->
155<FloaterButtonImageColor value="239, 156, 0, 255" /> <!-- The floater buttons (like the close box) are white images that receive this color. --> 189<FloaterButtonImageColor value="239, 156, 0, 255" /> <!-- The floater buttons (like the close box) are white images that receive this color. -->
156<ButtonCautionImageColor value="255, 255, 255, 255" /> <!-- Match the caution dialog buttons to the default --> 190<ButtonCautionImageColor value="255, 255, 255, 255" /> <!-- Match the caution dialog buttons to the default -->
157<HealthTextColor value="255, 255, 255, 255" />
158<MapAutopilotColor value="255, 128, 0, 255" /> 191<MapAutopilotColor value="255, 128, 0, 255" />
159<ContextSilhouetteColor value="239, 156, 0, 255" /> <!-- For "context" highlighting, i.e. pie menu --> 192<ContextSilhouetteColor value="239, 156, 0, 255" /> <!-- For "context" highlighting, i.e. pie menu -->
160<ScriptBgReadOnlyColor value="100, 100, 100, 255" /> 193<GroupOverTierColor value="110, 15, 15, 255" /> <!-- Warning text in Group Info window -->
161<ParcelTextColor value="144, 165, 208, 255" /> <!-- Parcel name on menu bar, normal state --> 194<ConsoleBackground value="0, 0, 0, 255" /> <!-- Background for inworld chat -->
162<ParcelHoverColor value="255, 255, 255, 255" /> <!-- Parcel name on menu bar, hover state --> 195
163<TimeTextColor value="255, 255, 255, 255" /> <!-- SL Time on menu bar -->
164<BalanceTextColor value="0, 255, 0, 255" /> <!-- Linden dollar balance on menu bar -->
165<HealthTextColor value="255, 255, 255, 255" /> <!-- Damage meter text on menu bar -->
166<GroupOverTierColor value="110, 15, 15, 255" /> <!-- Warning text in Group Info window -->
167<FilterBackgroundColor value="0, 0, 20, 255" /> <!-- Matching region of Inventory search text -->
168<FilterTextColor value="255, 200, 70, 255" />
169<InventoryItemSuffixColor value="191, 216, 216, 255" /> <!-- "worn", "no modify", etc-->
170<InventorySearchStatusColor value="255, 255, 255, 255" />
171<ConsoleBackground value="0, 0, 0, 255" />
172<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/> <!-- "loading..." in the inv -->
173<InventoryBackgroundColor value="62, 62, 62, 80"/>
174
175<!-- Alert box colors -->
176<AlertBoxColor value="62, 62, 62, 255" /> <!-- Warnings floaters, like when returning objects -->
177<AlertTextColor value="147, 169, 213, 255" />
178<AlertCautionBoxColor value="254, 209, 118, 255" /> <!-- Background color of caution alerts -->
179<AlertCautionTextColor value="0, 0, 0, 255" /> <!-- Foreground color of the special title text in caution alerts -->
180
181<!-- Multi sliders, as in the sky animation setting -->
182<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>
183<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>
184<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>
185<MultiSliderTrackColor value="30, 30, 30, 255"/>
186<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>
187<MultiSliderTriangleColor value="255, 255, 50, 255"/>
188
189</settings> 196</settings>
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 @@
36 </string> 36 </string>
37 <button bottom="-40" follows="left|top" height="20" label="Profile..." left="5" 37 <button bottom="-40" follows="left|top" height="20" label="Profile..." left="5"
38 name="profile_callee_btn" width="80" /> 38 name="profile_callee_btn" width="80" />
39 <button bottom_delta="0" follows="left|top" font="SansSerif"
40 halign="center" bottom ="-40" height="20" label="Offer Teleport" left_delta="85"
41 mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
39 <button bottom="-40" follows="left|top" halign="center" height="20" 42 <button bottom="-40" follows="left|top" halign="center" height="20"
40 image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" 43 image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
41 label="Call" left_delta="85" name="start_call_btn" width="100" /> 44 label="Call" left_delta="107" name="start_call_btn" width="100" />
42 <button bottom="-40" follows="left|top" halign="center" height="20" 45 <button bottom="-40" follows="left|top" halign="center" height="20"
43 image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" 46 image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
44 label="End Call" left_delta="0" name="end_call_btn" pad_right="10" 47 label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
@@ -51,9 +54,6 @@
51 image_unselected="icn_speaker_dark.tga" label="" left_delta="56" 54 image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
52 name="mute_btn" tool_tip="Mute voice" width="25" /> 55 name="mute_btn" tool_tip="Mute voice" width="25" />
53 </panel> 56 </panel>
54 <button bottom_delta="0" follows="right|top" font="SansSerif"
55 halign="center" bottom ="-40" height="20" label="Offer Teleport" right="-5"
56 mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
57 <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" 57 <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
58 bottom="30" embedded_items="false" enabled="false" 58 bottom="30" embedded_items="false" enabled="false"
59 follows="left|top|right|bottom" font="SansSerif" height="221" left="5" 59 follows="left|top|right|bottom" font="SansSerif" height="221" left="5"
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 @@
12 <button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload" 12 <button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload"
13 left_delta="65" name="reload" width="70" /> 13 left_delta="65" name="reload" width="70" />
14 <combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20" 14 <combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20"
15 left_delta="75" max_chars="255" name="address" width="280" /> 15 left_delta="75" max_chars="235" name="address" width="225" />
16 <button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go" 16 <button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go"
17 left_delta="285" name="go" width="55" /> 17 left_delta="230" name="go" width="55" />
18 <button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home"
19 left_delta="60" name="home" width="55" />
18 </layout_panel> 20 </layout_panel>
19 <layout_panel auto_resize="false" bottom="0" height="20" left="0" 21 <layout_panel auto_resize="false" bottom="0" height="20" left="0"
20 name="parcel_owner_controls" user_resize="false" width="540"> 22 name="parcel_owner_controls" user_resize="false" width="540">
@@ -30,6 +32,8 @@
30 <check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20" 32 <check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20"
31 label="Always open in my web browser" left_delta="190" name="open_always" 33 label="Always open in my web browser" left_delta="190" name="open_always"
32 width="200" /> 34 width="200" />
35 <button bottom="5" enabled="false" follows="bottom|right" height="20" label="Set Home To Here"
36 left="-265" name="set_home" width="155" />
33 <button bottom="5" follows="bottom|right" height="20" label="Close" left="-70" 37 <button bottom="5" follows="bottom|right" height="20" label="Close" left="-70"
34 name="close" width="70" /> 38 name="close" width="70" />
35 </layout_panel> 39 </layout_panel>
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 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right" 2<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
3 height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true" 3 height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true"
4 tear_off="false" width="802"> 4 tear_off="false" width="802">
5 <menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true" 5 <menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
6 height="263" label="File" left="0" mouse_opaque="false" name="File" 6 height="263" label="File" left="0" mouse_opaque="false" name="File"
7 opaque="true" tear_off="false" width="243"> 7 opaque="true" tear_off="false" width="243">
8 <menu_item_call bottom="-29" enabled="true" height="19" label="Quit" left="0" 8 <menu_item_call bottom="-29" enabled="true" height="19" label="Quit" left="0"
9 mouse_opaque="true" name="Quit" shortcut="control|Q" width="243"> 9 mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
10 <on_click function="File.Quit" userdata="" /> 10 <on_click function="File.Quit" userdata="" />
11 </menu_item_call> 11 </menu_item_call>
12 </menu> 12 </menu>
13 <menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true" 13 <menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
14 height="439" label="Edit" left="38" mouse_opaque="false" name="Edit" 14 height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"
15 opaque="true" tear_off="false" width="153"> 15 opaque="true" tear_off="false" width="153">
16 <menu_item_call bottom="-29" enabled="true" height="19" label="Preferences..." left="0" 16 <menu_item_call bottom="-29" enabled="true" height="19" label="Preferences..." left="0"
17 mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153"> 17 mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">
18 <on_click function="ShowFloater" userdata="preferences" /> 18 <on_click function="ShowFloater" userdata="preferences" />
19 </menu_item_call> 19 </menu_item_call>
20 </menu> 20 </menu>
21 <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true" 21 <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
22 height="317" label="Help" left="80" mouse_opaque="false" name="Help" 22 height="317" label="Help" left="80" mouse_opaque="false" name="Help"
23 opaque="true" tear_off="false" width="166"> 23 opaque="true" tear_off="false" width="166">
24 <menu_item_call bottom="-29" enabled="true" height="19" label="Second Life Help" left="0" 24 <menu_item_call bottom="-29" enabled="true" height="19" label="Viewer Help" left="0"
25 mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166"> 25 mouse_opaque="true" name="Viewer Help" shortcut="F1" width="166">
26 <on_click function="ShowFloater" userdata="help f1" /> 26 <on_click function="ShowFloater" userdata="help f1" />
27 </menu_item_call> 27 </menu_item_call>
28 <menu_item_call bottom="-48" enabled="true" height="19" label="About Second Life..." left="0" 28 <menu_item_call bottom="-48" enabled="true" height="19" label="About Imprudence..." left="0"
29 mouse_opaque="true" name="About Second Life..." width="166"> 29 mouse_opaque="true" name="About Imprudence..." width="166">
30 <on_click function="ShowFloater" userdata="about" /> 30 <on_click function="ShowFloater" userdata="about" />
31 </menu_item_call> 31 </menu_item_call>
32 </menu> 32 </menu>
33</menu_bar> 33</menu_bar>
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..682acb9 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 @@
271 <on_enable function="View.EnableLastChatter" /> 271 <on_enable function="View.EnableLastChatter" />
272 </menu_item_call> 272 </menu_item_call>
273 <menu_item_separator /> 273 <menu_item_separator />
274 <menu_item_call name="Web Browser" label="Web Browser"
275 shortcut="control|B">
276 <on_click function="ShowFloater" userdata="inworld browser" />
277 </menu_item_call>
278 <menu_item_separator />
274 <menu_item_check name="Toolbar" label="Toolbar"> 279 <menu_item_check name="Toolbar" label="Toolbar">
275 <on_click function="ShowFloater" userdata="toolbar" /> 280 <on_click function="ShowFloater" userdata="toolbar" />
276 <on_check function="FloaterVisible" userdata="toolbar" /> 281 <on_check function="FloaterVisible" userdata="toolbar" />
@@ -360,9 +365,9 @@
360 <on_click function="View.HighlightTransparent" userdata="" /> 365 <on_click function="View.HighlightTransparent" userdata="" />
361 <on_check function="View.CheckHighlightTransparent" /> 366 <on_check function="View.CheckHighlightTransparent" />
362 </menu_item_check> 367 </menu_item_check>
363 <menu_item_check name="Beacons Always On" label="Beacons Always On"> 368 <menu_item_check name="Beacons Always On" label="Show Beacons">
364 <on_click function="ToggleControl" userdata="BeaconAlwaysOn" /> 369 <on_click function="ToggleControl" userdata="BeaconsEnabled" />
365 <on_check control="BeaconAlwaysOn" /> 370 <on_check control="BeaconsEnabled" />
366 </menu_item_check> 371 </menu_item_check>
367 <menu name="Beacons" create_jump_keys="true" label="Beacons" 372 <menu name="Beacons" create_jump_keys="true" label="Beacons"
368 opaque="true" tear_off="true"> 373 opaque="true" tear_off="true">
@@ -608,6 +613,12 @@
608 userdata="movable" /> 613 userdata="movable" />
609 <on_check control="SelectMovableOnly" /> 614 <on_check control="SelectMovableOnly" />
610 </menu_item_check> 615 </menu_item_check>
616 <menu_item_check name="Select Only Copyable Objects"
617 label="Select Only Copyable Objects">
618 <on_click function="Tools.SelectOnlyCopyableObjects"
619 userdata="copyable" />
620 <on_check control="SelectCopyableOnly" />
621 </menu_item_check>
611 <menu_item_check name="Select By Surrounding" 622 <menu_item_check name="Select By Surrounding"
612 label="Select By Surrounding"> 623 label="Select By Surrounding">
613 <on_click function="Tools.SelectBySurrounding" 624 <on_click function="Tools.SelectBySurrounding"
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:
579 <option name="Decline"> 579 <option name="Decline">
580 Decline 580 Decline
581 </option> 581 </option>
582 <option name="Ignore">
583 Ignore
584 </option>
582 </notify> 585 </notify>
583 <notify name="OfferFriendshipNoMessage" tip="false"> 586 <notify name="OfferFriendshipNoMessage" tip="false">
584 <message name="message"> 587 <message name="message">
@@ -593,6 +596,9 @@ see each other&apos;s online status.)
593 <option name="Decline"> 596 <option name="Decline">
594 Decline 597 Decline
595 </option> 598 </option>
599 <option name="Ignore">
600 Ignore
601 </option>
596 </notify> 602 </notify>
597 <notify name="FriendshipAccepted" tip="false"> 603 <notify name="FriendshipAccepted" tip="false">
598 <message name="message"> 604 <message name="message">
@@ -616,6 +622,9 @@ so you can quickly IM this resident.
616 <option name="Decline"> 622 <option name="Decline">
617 Decline 623 Decline
618 </option> 624 </option>
625 <option name="Ignore">
626 Ignore
627 </option>
619 </notify> 628 </notify>
620 <notify name="RegionRestartMinutes" tip="false"> 629 <notify name="RegionRestartMinutes" tip="false">
621 <message name="message"> 630 <message name="message">
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 @@
25 label="IM/Call" left_delta="0" name="IM" 25 label="IM/Call" left_delta="0" name="IM"
26 tool_tip="Open Instant Message session" width="80" /> 26 tool_tip="Open Instant Message session" width="80" />
27 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 27 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
28 label="Info" name="Info" width="80" />
29 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
30 label="Activate" name="Activate" width="80" /> 28 label="Activate" name="Activate" width="80" />
31 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 29 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
32 label="Leave" name="Leave" width="80" /> 30 label="Invite..." name="Invite..." width="80" />
31 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
32 label="Info" name="Info" width="80" />
33 <button bottom_delta="-35" follows="top|right" font="SansSerif" height="22" 33 <button bottom_delta="-35" follows="top|right" font="SansSerif" height="22"
34 label="Create..." name="Create" width="80" /> 34 label="Create..." name="Create" width="80" />
35 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 35 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
36 label="Search..." name="Search..." width="80" /> 36 label="Search..." name="Search..." width="80" />
37 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 37 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
38 label="Invite..." name="Invite..." width="80" /> 38 label="Leave" name="Leave" width="80" />
39</panel> 39</panel>
generated by cgit v1.1 at 2024-11-15 21:28:57 +0000