aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorAnders Arnholm2008-12-15 16:10:11 +0100
committerAnders Arnholm2008-12-15 16:10:11 +0100
commit9737c3f8cb1dd9b3bf7aacb5d9f324867916e5d3 (patch)
treed15cc55199dfa9281cf6d285900e1580aba55fad /linden
parentMerge branch 'next' into openal (diff)
parentNot openal branch next branch. (diff)
downloadmeta-impy-9737c3f8cb1dd9b3bf7aacb5d9f324867916e5d3.zip
meta-impy-9737c3f8cb1dd9b3bf7aacb5d9f324867916e5d3.tar.gz
meta-impy-9737c3f8cb1dd9b3bf7aacb5d9f324867916e5d3.tar.bz2
meta-impy-9737c3f8cb1dd9b3bf7aacb5d9f324867916e5d3.tar.xz
Merge branch 'next' into openal
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/llcommon/llversionviewer.h4
-rw-r--r--linden/indra/newview/app_settings/settings.xml4
-rw-r--r--linden/indra/newview/llfloatergroupinvite.cpp20
-rw-r--r--linden/indra/newview/llfloatergroupinvite.h6
-rw-r--r--linden/indra/newview/llviewerwindow.cpp2
-rw-r--r--linden/indra/newview/pipeline.cpp2
-rw-r--r--linden/indra/newview/skins/default/colors_base.xml325
-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/menu_viewer.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notify.xml3
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_groups.xml8
-rw-r--r--linden/indra/newview/skins/silver/colors_base.xml374
-rwxr-xr-xlinden/scripts/build_version.py4
13 files changed, 395 insertions, 371 deletions
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";
43const char * const IMP_VIEWER_NAME = "Imprudence"; 43const char * const IMP_VIEWER_NAME = "Imprudence";
44 44
45const S32 IMP_VERSION_MAJOR = 1; 45const S32 IMP_VERSION_MAJOR = 1;
46const S32 IMP_VERSION_MINOR = 0; 46const S32 IMP_VERSION_MINOR = 1;
47const S32 IMP_VERSION_PATCH = 0; 47const S32 IMP_VERSION_PATCH = 0;
48const char * const IMP_VERSION_TEST = ""; 48const char * const IMP_VERSION_TEST = "alpha";
49 49
50#endif 50#endif
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 @@
664 <integer>0</integer> 664 <integer>0</integer>
665 </array> 665 </array>
666 </map> 666 </map>
667 <key>BeaconAlwaysOn</key> 667 <key>BeaconsEnabled</key>
668 <map> 668 <map>
669 <key>Comment</key> 669 <key>Comment</key>
670 <string>Beacons / highlighting always on</string> 670 <string>Beacons / highlighting always on</string>
671 <key>Persist</key> 671 <key>Persist</key>
672 <integer>1</integer> 672 <integer>0</integer>
673 <key>Type</key> 673 <key>Type</key>
674 <string>Boolean</string> 674 <string>Boolean</string>
675 <key>Value</key> 675 <key>Value</key>
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 @@
34#include "llfloatergroupinvite.h" 34#include "llfloatergroupinvite.h"
35#include "llpanelgroupinvite.h" 35#include "llpanelgroupinvite.h"
36 36
37const char FLOATER_TITLE[] = "Group Invitation"; 37const char FLOATER_TITLE[] = "Invite to ";
38const LLRect FGI_RECT(0, 380, 210, 0); 38const LLRect FGI_RECT(0, 380, 210, 0);
39 39
40class LLFloaterGroupInvite::impl 40class LLFloaterGroupInvite::impl
@@ -132,6 +132,11 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUU
132 group_id); 132 group_id);
133 133
134 impl::sInstances[group_id] = fgi; 134 impl::sInstances[group_id] = fgi;
135
136 // Look up the group name.
137 // The callback will insert it into the title.
138 const BOOL is_group = TRUE;
139 gCacheName->get(group_id, is_group, callbackLoadGroupName, NULL);
135 140
136 fgi->mImpl->mInvitePanelp->clear(); 141 fgi->mImpl->mInvitePanelp->clear();
137 } 142 }
@@ -145,3 +150,16 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUU
145 fgi->open(); /*Flawfinder: ignore*/ 150 fgi->open(); /*Flawfinder: ignore*/
146 fgi->mImpl->mInvitePanelp->update(); 151 fgi->mImpl->mInvitePanelp->update();
147} 152}
153
154void LLFloaterGroupInvite::callbackLoadGroupName(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* data)
155{
156 LLFloaterGroupInvite *fgi = get_if_there(impl::sInstances, id, (LLFloaterGroupInvite*)NULL);
157
158 if (fgi)
159 {
160 // Build a new title including the group name.
161 std::ostringstream title;
162 title << FLOATER_TITLE << first;
163 fgi->setTitle(title.str());
164 }
165}
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:
52 52
53 class impl; 53 class impl;
54 impl* mImpl; 54 impl* mImpl;
55private:
56 static void callbackLoadGroupName(const LLUUID& id,
57 const std::string& first,
58 const std::string& last,
59 BOOL is_group,
60 void* data);
55}; 61};
56 62
57#endif 63#endif
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:
470 ypos += y_inc; 470 ypos += y_inc;
471 } 471 }
472 // only display these messages if we are actually rendering beacons at this moment 472 // only display these messages if we are actually rendering beacons at this moment
473 if (LLPipeline::getRenderBeacons(NULL) && gSavedSettings.getBOOL("BeaconAlwaysOn")) 473 if (LLPipeline::getRenderBeacons(NULL) && gSavedSettings.getBOOL("BeaconsEnabled"))
474 { 474 {
475 if (LLPipeline::getRenderParticleBeacons(NULL)) 475 if (LLPipeline::getRenderParticleBeacons(NULL))
476 { 476 {
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)
2101 } 2101 }
2102 2102
2103 // 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 2103 // 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
2104 if (gSavedSettings.getBOOL("BeaconAlwaysOn")) 2104 if (gSavedSettings.getBOOL("BeaconsEnabled"))
2105 { 2105 {
2106 if (sRenderScriptedTouchBeacons) 2106 if (sRenderScriptedTouchBeacons)
2107 { 2107 {
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 @@
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
144<!-- HELP WINDOW --> 168<!-- INVENTORY -->
145<HelpBgColor value="200, 209, 204, 255" /> 169<InventoryBackgroundColor value="62, 62, 62, 80"/> <!-- Inventory floater background -->
146<HelpFgColor value="0, 0, 0, 255" /> 170<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/> <!-- "loading..." -->
147<HelpScrollTrackColor value="183, 184, 188, 255" /> 171<InventoryItemSuffixColor value="191, 216, 216, 255"/> <!-- "worn", "no modify", etc -->
148<HelpScrollThumbColor value="80, 96, 124, 255" /> 172<FilterBackgroundColor value="0, 0, 20, 255" /> <!-- Inventory search background -->
149<HelpScrollHighlightColor value="115, 132, 155, 255" /> 173<FilterTextColor value="255, 200, 70, 255" /> <!-- Inventory search text -->
150<HelpScrollShadowColor value="0, 0, 0, 255" /> 174<InventorySearchStatusColor value="255, 255, 255, 255" /> <!-- "Searching..." -->
151 175
152<!-- MISC --> 176<!-- MISC -->
153<AvatarNameColor value="251, 175, 93, 255" /> <!-- Text color of avatar nametags --> 177<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 --> 178<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. --> 179<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 --> 180<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" /> 181<MapAutopilotColor value="255, 128, 0, 255" />
159<ContextSilhouetteColor value="239, 156, 0, 255" /> <!-- For "context" highlighting, i.e. pie menu --> 182<ContextSilhouetteColor value="239, 156, 0, 255" /> <!-- For "context" highlighting, i.e. pie menu -->
160<ScriptBgReadOnlyColor value="100, 100, 100, 255" /> 183<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 --> 184<ConsoleBackground value="0, 0, 0, 255" /> <!-- Background for inworld chat -->
162<ParcelHoverColor value="255, 255, 255, 255" /> <!-- Parcel name on menu bar, hover state --> 185
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> 186</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/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 @@
360 <on_click function="View.HighlightTransparent" userdata="" /> 360 <on_click function="View.HighlightTransparent" userdata="" />
361 <on_check function="View.CheckHighlightTransparent" /> 361 <on_check function="View.CheckHighlightTransparent" />
362 </menu_item_check> 362 </menu_item_check>
363 <menu_item_check name="Beacons Always On" label="Beacons Always On"> 363 <menu_item_check name="Beacons Always On" label="Show Beacons">
364 <on_click function="ToggleControl" userdata="BeaconAlwaysOn" /> 364 <on_click function="ToggleControl" userdata="BeaconsEnabled" />
365 <on_check control="BeaconAlwaysOn" /> 365 <on_check control="BeaconsEnabled" />
366 </menu_item_check> 366 </menu_item_check>
367 <menu name="Beacons" create_jump_keys="true" label="Beacons" 367 <menu name="Beacons" create_jump_keys="true" label="Beacons"
368 opaque="true" tear_off="true"> 368 opaque="true" tear_off="true">
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 d169741..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">
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>
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 @@
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<!-- WINDOWS --> 4
5<TitleBarFocusColor value="50, 115, 185, 120" /> <!-- Focused window title bar highlight, no equivalent for unfocused windows --> 5<!-- WINDOWS -->
6<FloaterFocusBorderColor value="50, 115, 185, 75" /> 6<TitleBarFocusColor value="50, 115, 185, 120" /> <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
7<FloaterUnfocusBorderColor value="110, 110, 110, 60" /> 7<FloaterFocusBorderColor value="50, 115, 185, 75" /> <!-- Focused window border color -->
8<FocusBackgroundColor value="165, 180, 200, 245" /> <!-- Background color of focused floaters --> 8<FloaterUnfocusBorderColor value="110, 110, 110, 60" /> <!-- Unfocused window border color -->
9<DefaultBackgroundColor value="165, 180, 200, 128" /> <!-- Background color for unfocused floaters --> 9<FocusBackgroundColor value="165, 180, 200, 245" /> <!-- Background color of focused windows -->
10<ColorDropShadow value="0, 0, 0, 200" /> <!-- The drop shadow behind windows and menus --> 10<DefaultBackgroundColor value="165, 180, 200, 128" /> <!-- Background color for unfocused windows -->
11<DefaultHighlightDark value="50, 115, 185, 255" /> 11<ColorDropShadow value="0, 0, 0, 200" /> <!-- The drop shadow behind windows and menus -->
12<DefaultHighlightLight value="50, 115, 185, 255" /> 12<DefaultHighlightDark value="50, 115, 185, 255" />
13<DefaultShadowDark value="50, 115, 185, 255" /> 13<DefaultHighlightLight value="50, 115, 185, 255" /> <!-- Unfocused border, bottom portion -->
14<DefaultShadowLight value="50, 115, 185, 255" /> 14<DefaultShadowDark value="50, 115, 185, 255" /> <!-- Unfocused border, top portion -->
15 15<DefaultShadowLight value="50, 115, 185, 255" /> <!-- Tab area border for IMs -->
16<!-- LABELS --> 16
17<LabelDisabledColor value="0, 30, 60, 128" /> 17<!-- WINDOW LABELS -->
18<LabelSelectedColor value="255, 255, 255, 255" /> 18<LabelDisabledColor value="0, 30, 60, 128" /> <!-- Color for unfocused window titles -->
19<LabelSelectedDisabledColor value="164, 190, 237, 128" /> 19<LabelSelectedColor value="255, 255, 255, 255" /> <!-- Color for mouseovered clickable labels, e.g. version info on the login screen -->
20<LabelTextColor value="0, 30, 60, 255" /> 20<LabelSelectedDisabledColor value="164, 190, 237, 128" />
21 21<LabelTextColor value="0, 30, 60, 255" /> <!-- Color for window labels and titles -->
22<!-- LOGIN --> 22
23<LoginProgressBarBgColor value="255, 255, 255, 255" /> 23<!-- LOGIN -->
24<LoginProgressBarFgColor value="255, 255, 255, 255" /> 24<LoginProgressBarBgColor value="255, 255, 255, 255" /> <!-- Login progress bar background -->
25<LoginProgressBoxBorderColor value="0, 30, 60, 0" /> 25<LoginProgressBarFgColor value="255, 255, 255, 255" /> <!-- Login progress bar -->
26<LoginProgressBoxCenterColor value="0, 0, 0, 200" /> 26<LoginProgressBoxBorderColor value="0, 30, 60, 0" /> <!-- Login progress box border -->
27<LoginProgressBoxShadowColor value="0, 0, 0, 200" /> 27<LoginProgressBoxCenterColor value="0, 0, 0, 200" /> <!-- Login progress box background -->
28<LoginProgressBoxTextColor value="255, 255, 255, 255"/> 28<LoginProgressBoxShadowColor value="0, 0, 0, 200" /> <!-- Login progress box shadow -->
29 29<LoginProgressBoxTextColor value="255, 255, 255, 255"/> <!-- Login progress text -->
30<!-- BUTTONS --> 30
31<ButtonLabelColor value="0, 30, 60, 255" /> <!-- Text labels for buttons, like the "OK" text --> 31<!-- BUTTONS -->
32<ButtonLabelSelectedColor value="255, 255, 255, 255" /> 32<ButtonLabelColor value="0, 30, 60, 255" /> <!-- Label text color for buttons, like the "OK" text -->
33<ButtonLabelDisabledColor value="0, 30, 60, 128" /> 33<ButtonLabelSelectedColor value="255, 255, 255, 255" /> <!-- Label text color when button selected -->
34<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" /> 34<ButtonLabelDisabledColor value="0, 30, 60, 128" /> <!-- Label text color when button disabled -->
35<ButtonSelectedBgColor value="62, 62, 62, 255" /> 35<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" /> <!-- Label text color when button disabled but selected -->
36<ButtonSelectedColor value="255, 255, 255, 255" /> 36<ButtonSelectedBgColor value="62, 62, 62, 255" /> <!-- Not used -->
37<ButtonUnselectedBgColor value="62, 62, 62, 255" /> 37<ButtonSelectedColor value="255, 255, 255, 255" /> <!-- Not used -->
38<ButtonUnselectedFgColor value="255, 255, 255, 255" /> 38<ButtonUnselectedBgColor value="62, 62, 62, 255" /> <!-- Not used -->
39<ButtonBorderColor value="239, 156, 0, 255" /> 39<ButtonUnselectedFgColor value="255, 255, 255, 255" /> <!-- Not used -->
40<ButtonFlashBgColor value="255, 190, 62, 127" /> 40<ButtonBorderColor value="239, 156, 0, 255" /> <!-- Not used -->
41<ButtonColor value="255, 255, 255, 255" /> <!-- Blended with button art, usually left as opaque white --> 41<ButtonFlashBgColor value="255, 190, 62, 127" /> <!-- Color of tab flashing on incoming IM -->
42<ButtonImageColor 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 -->
43 43<ButtonImageColor value="255, 255, 255, 255" /> <!-- Button color override (also checkboxes and scroll arrows).
44<!-- SLIDERS --> 44 Blended with button art, usually left as opaque white -->
45<SliderDisabledThumbColor value="0, 0, 0, 255" /> 45
46<SliderThumbCenterColor value="255, 255, 255, 255" /> 46<!-- SLIDERS, single line -->
47<SliderThumbOutlineColor value="37, 64, 99, 255" /> 47<SliderDisabledThumbColor value="0, 0, 0, 255" /> <!-- Not used -->
48<SliderTrackColor value="37, 64, 99, 255" /> 48<SliderThumbCenterColor value="255, 255, 255, 255" /> <!-- Unfocused slider thumb color -->
49 49<SliderThumbOutlineColor value="37, 64, 99, 255" /> <!-- Focused slider thumb color -->
50<!-- TEXTFIELDS --> 50<SliderTrackColor value="37, 64, 99, 255" /> <!-- Not used -->
51<TextBgFocusColor value="255, 255, 255, 255" /> <!-- Text field background when receiving input (focused) --> 51
52<TextBgReadOnlyColor value="255, 255, 255, 140" /> <!-- Text field background when read-only --> 52<!-- SLIDERS, multi line (as in the sky editor) -->
53<TextBgWriteableColor value="255, 255, 255, 255" /> <!-- Text field background when not receiving input (unfocused) --> 53<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/> <!-- Not used -->
54<TextCursorColor value="0, 0, 0, 255" /> 54<MultiSliderThumbCenterColor value="183, 184, 188, 255"/> <!-- Not used -->
55<TextFgColor value="45, 48, 45, 255" /> 55<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/> <!-- Not used -->
56<TextFgReadOnlyColor value="0, 0, 0, 200" /> 56<MultiSliderTrackColor value="30, 30, 30, 255"/> <!-- Not used -->
57<TextFgTentativeColor value="0, 0, 0, 128" /> 57<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/> <!-- Not used -->
58<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- i.e. About Land name that you don't own --> 58<MultiSliderTriangleColor value="255, 255, 50, 255"/> <!-- Not used -->
59<TextEmbeddedItemColor value="0, 0, 128, 255" /> 59
60<TextDefaultColor value="0, 20, 0, 255"/> 60<!-- TEXTFIELDS -->
61 61<TextBgFocusColor value="255, 255, 255, 255" /> <!-- Text field background when receiving input (focused) -->
62<!-- LISTBOXES --> 62<TextBgReadOnlyColor value="255, 255, 255, 140" /> <!-- Text field background when read-only -->
63<ScrollBgReadOnlyColor value="255, 255, 255, 140" /> 63<TextBgWriteableColor value="255, 255, 255, 255" /> <!-- Text field background when not receiving input (unfocused) -->
64<ScrollBgWriteableColor value="255, 255, 255, 140" /> 64<TextCursorColor value="0, 0, 0, 255" /> <!-- Cursor color in notecards and scripts only -->
65<ScrollBGStripeColor value="145, 180, 220, 60" /> 65<TextFgColor value="48, 48, 45, 255" /> <!-- Text color for all text entry fields; cursor color for line editors -->
66<ScrollDisabledColor value="128, 128, 128, 204" /> 66<TextFgReadOnlyColor value="0, 0, 0, 200" /> <!-- Text color in read-only fields -->
67<ScrollSelectedBGColor value="50, 115, 185, 150" /> 67<TextFgTentativeColor value="0, 0, 0, 128" /> <!-- Initial entry in text entry fields, e.g. "Click here to chat." -->
68<ScrollSelectedFGColor value="0, 30, 60, 255" /> <!-- Text color --> 68<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- Text of read-only items embedded in notecards -->
69<ScrollUnselectedColor value="0, 30, 60, 255" /> <!-- Text color --> 69<TextEmbeddedItemColor value="0, 0, 128, 255" /> <!-- Text of items embedded in notecards -->
70<ScrollHighlightedColor value="145, 180, 220, 128" /> <!-- Hover color --> 70<TextDefaultColor value="0, 20, 0, 255"/> <!-- Non-keyword text in the script editor -->
71<ScrollbarThumbColor value="120, 160, 200, 255" /> 71<ScriptBgReadOnlyColor value="180, 180, 180, 255" /> <!-- Not used -->
72<ScrollbarTrackColor value="183, 202, 220, 255" /> 72
73 73<!-- LISTBOXES -->
74<!-- MENUS --> 74<ScrollBgReadOnlyColor value="255, 255, 255, 140" /> <!-- Background of read only lists -->
75<MenuBarBgColor value="185, 200, 220, 230" /> 75<ScrollBgWriteableColor value="255, 255, 255, 140" /> <!-- Background of editable lists, e.g. groups-->
76<MenuBarGodBgColor value="100, 200, 130, 230" /> 76<ScrollBGStripeColor value="145, 180, 220, 60" /> <!-- Background stripes in sortable lists, e.g. Events Search -->
77<MenuNonProductionGodBgColor value="100, 200, 130, 230" /> 77<ScrollDisabledColor value="128, 128, 128, 204" />
78<MenuNonProductionBgColor value="230, 70, 70, 230" /> 78<ScrollSelectedBGColor value="50, 115, 185, 150" /> <!-- Selected item in a list highlight -->
79<MenuDefaultBgColor value="210, 220, 230, 245" /> 79<ScrollSelectedFGColor value="0, 30, 60, 255" /> <!-- Text color -->
80<MenuItemDisabledColor value="0, 30, 60, 128" /> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) --> 80<ScrollUnselectedColor value="0, 30, 60, 255" /> <!-- Text color -->
81<MenuItemEnabledColor value="0, 30, 60, 255" /> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) --> 81<ScrollHighlightedColor value="145, 180, 220, 128" /> <!-- Hover color -->
82<MenuItemHighlightBgColor value="50, 115, 185, 100" /> 82<ScrollbarThumbColor value="120, 160, 200, 255" /> <!-- Scroll bar -->
83<MenuItemHighlightFgColor value="0, 30, 60, 255" /> <!-- Highlighted menu text color; also treeview node selection highlight --> 83<ScrollbarTrackColor value="183, 202, 220, 255" /> <!-- Scroll bar background -->
84<MenuPopupBgColor value="197, 217, 234, 240" /> 84
85 85<!-- MENUS -->
86<!-- PIE MENUS --> 86<MenuBarBgColor value="185, 200, 220, 230" /> <!-- Menu bar background -->
87<PieMenuBgColor value="118, 156, 201, 230" /> 87<MenuBarGodBgColor value="100, 200, 130, 230" /> <!-- Menu bar background with God Mode enabled -->
88<PieMenuLineColor value="255, 255, 255, 60" /> 88<MenuNonProductionGodBgColor value="100, 200, 130, 230" /> <!-- Beta viewer menu bar background -->
89<PieMenuSelectedColor value="185, 200, 220, 120" /> 89<MenuNonProductionBgColor value="230, 70, 70, 230" /> <!-- Beta viewer menu bar background with God Mode enabled -->
90 90<MenuDefaultBgColor value="210, 220, 230, 245" /> <!-- Menu background -->
91<!-- TOOLTIPS --> 91<MenuItemDisabledColor value="0, 30, 60, 128" /> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
92<ToolTipBgColor value="250, 255, 225, 230" /> 92<MenuItemEnabledColor value="0, 30, 60, 255" /> <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
93<ToolTipBorderColor value="171, 212, 245, 255" /> 93<MenuItemHighlightBgColor value="50, 115, 185, 100" /> <!-- Highlighted menu item background color -->
94<ToolTipTextColor value="0, 0, 0, 255" /> 94<MenuItemHighlightFgColor value="0, 30, 60, 255" /> <!-- Highlighted menu item text color; also treeview node selection highlight -->
95 95<MenuPopupBgColor value="197, 217, 234, 240" /> <!-- Right-click menu background -->
96<!-- NOTIFICATION POP-UPS --> 96
97<NotifyBoxColor value="170, 210, 255, 240" /> 97<!-- PIE MENUS -->
98<NotifyTextColor value="0, 30, 60, 255" /> 98<PieMenuBgColor value="118, 156, 201, 230" /> <!-- Color of pie menu -->
99<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- the background color of caution permissions prompts --> 99<PieMenuLineColor value="255, 255, 255, 60" /> <!-- Color of pie menu slice separators -->
100<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- the foreground color of the special title text in caution permissions prompts --> 100<PieMenuSelectedColor value="185, 200, 220, 120" /> <!-- Color of pie menu slice when selected -->
101<GroupNotifyBoxColor value="170, 210, 255, 240" /> 101
102<GroupNotifyTextColor value="0, 30, 60, 255" /> 102<!-- MENU BAR -->
103 103<ParcelTextColor value="40, 40, 90, 255" /> <!-- Parcel name on menu bar, normal state -->
104<!-- CHAT AND IM HISTORY TEXTBOX COLORS --> 104<ParcelHoverColor value="70, 70, 100, 255" /> <!-- Parcel name on menu bar, hover state -->
105<ChatHistoryBgColor value="0, 30, 80, 200" /> 105<TimeTextColor value="0, 30, 60, 255" /> <!-- SL Time on menu bar -->
106<ChatHistoryTextColor value="255, 255, 255, 255" /> 106<BalanceTextColor value="0, 100, 40, 255" /> <!-- Linden dollar balance on menu bar -->
107<IMHistoryBgColor value="0, 30, 80, 200" /> 107<HealthTextColor value="110, 15, 15, 255" /> <!-- Damage meter text on menu bar -->
108<IMHistoryTextColor value="255, 255, 255, 255" /> 108
109 109<!-- TOOLTIPS -->
110<!-- IN-WORLD SELECTION --> 110<ToolTipBgColor value="250, 255, 225, 230" /> <!-- Tool tips, i.e. "Hover Tips" -->
111<SilhouetteParentColor value="255, 255, 0, 255" /> 111<ToolTipBorderColor value="171, 212, 245, 255" /> <!-- Not used -->
112<SilhouetteChildColor value="32, 106, 196, 255" /> 112<ToolTipTextColor value="0, 0, 0, 255" /> <!-- Tool tips text color -->
113<HighlightParentColor value="171, 212, 245, 255" /> 113
114<HighlightChildColor value="171, 212, 245, 255" /> 114<!-- NOTIFICATION POP-UPS -->
115<HighlightInspectColor value="255, 0, 255, 255" /> 115<NotifyBoxColor value="170, 210, 255, 240" /> <!-- Notification background, i.e. tp requests -->
116 116<NotifyTextColor value="0, 30, 60, 255" /> <!-- Notification text -->
117<!-- EDIT MODE GRID --> 117<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- Background color of caution permissions prompts -->
118<GridFocusPointColor value="255, 255, 255, 128" /> 118<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- Foreground color of the special title text in caution permissions prompts -->
119<GridlineColor value="255, 255, 255, 255" /> 119<GroupNotifyBoxColor value="170, 210, 255, 240" /> <!-- Group notices background -->
120<GridlineBGColor value="235, 235, 255, 200" /> 120<GroupNotifyTextColor value="0, 30, 60, 255" /> <!-- Group notices text -->
121<GridlineShadowColor value="0, 0, 0, 80" /> 121
122 122<!-- ALERT BOX COLORS -->
123<!-- PROPERTY LINES --> 123<AlertBoxColor value="165, 180, 200, 245" /> <!-- Alert floaters, like the warning before returning objects -->
124<PropertyColorAvail value="0, 0, 0, 0" /> 124<AlertTextColor value="0, 30, 60, 255" /> <!-- Alert floater text -->
125<PropertyColorGroup value="0, 184, 184, 102" /> 125<AlertCautionBoxColor value="254, 209, 118, 255" /> <!-- Background color of caution alerts -->
126<PropertyColorOther value="255, 0, 0, 102" /> 126<AlertCautionTextColor value="0, 0, 0, 255" /> <!-- Foreground color of the special title text in caution alerts -->
127<PropertyColorSelf value="0, 255, 0, 102" /> 127
128<PropertyColorForSale value="255, 128, 0, 102" /> 128<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
129<PropertyColorAuction value="128, 0, 255, 102" /> <!-- Match the color on the world map --> 129<ChatHistoryBgColor value="0, 30, 80, 200" /> <!-- Local Chat background -->
130 130<ChatHistoryTextColor value="255, 255, 255, 255" /> <!-- Local Chat text -->
131<!-- Icon Enable/Disable --> 131<IMHistoryBgColor value="0, 30, 80, 200" /> <!-- Instant Message background -->
132<IconEnabledColor value="255, 255, 255, 255"/> 132<IMHistoryTextColor value="255, 255, 255, 255" /> <!-- Instant Message text -->
133<IconDisabledColor value="147, 169, 213, 200"/> 133
134 134<!-- IN-WORLD SELECTION -->
135<!-- MINI-MAP --> 135<SilhouetteParentColor value="255, 255, 0, 255" /> <!-- Root prim selection outline -->
136<NetMapBackgroundColor value="0, 0, 0, 77" /> 136<SilhouetteChildColor value="32, 106, 196, 255" /> <!-- Child prim selection outline -->
137<NetMapYouOwnAboveWater value="0, 255, 255, 255" /> 137<HighlightParentColor value="171, 212, 245, 255" />
138<NetMapYouOwnBelowWater value="0, 200, 200, 255" /> 138<HighlightChildColor value="171, 212, 245, 255" />
139<NetMapGroupOwnAboveWater value="255, 0, 255, 255" /> 139<HighlightInspectColor value="255, 0, 255, 255" /> <!-- Selection outline when inspecting -->
140<NetMapGroupOwnBelowWater value="200, 0, 200, 255" /> 140
141<NetMapOtherOwnAboveWater value="60, 60, 60, 255" /> 141<!-- EDIT MODE GRID -->
142<NetMapOtherOwnBelowWater value="30, 30, 30, 255" /> 142<GridFocusPointColor value="255, 255, 255, 128" /> <!-- Not used -->
143 143<GridlineColor value="255, 255, 255, 255" /> <!-- Grid color -->
144<!-- HELP WINDOW --> 144<GridlineBGColor value="235, 235, 255, 200" /> <!-- Grid background color -->
145<HelpBgColor value="200, 209, 204, 255" /> 145<GridlineShadowColor value="0, 0, 0, 80" /> <!-- Grid drop shadow -->
146<HelpFgColor value="0, 0, 0, 255" /> 146
147<HelpScrollTrackColor value="0, 0, 0, 255" /> 147<!-- PROPERTY LINES -->
148<HelpScrollThumbColor value="255, 255, 255, 255" /> 148<PropertyColorAvail value="0, 0, 0, 0" />
149<HelpScrollHighlightColor value="115, 132, 155, 255" /> 149<PropertyColorGroup value="0, 184, 184, 102" /> <!-- Property group owns -->
150<HelpScrollShadowColor value="0, 0, 0, 255" /> 150<PropertyColorOther value="255, 0, 0, 102" /> <!-- Property others own -->
151 151<PropertyColorSelf value="0, 255, 0, 102" /> <!-- Property you own -->
152<!-- MISC --> 152<PropertyColorForSale value="255, 128, 0, 102" /> <!-- Property for sale -->
153<AvatarNameColor value="251, 175, 93, 255" /> <!-- Text color of avatar nametags --> 153<PropertyColorAuction value="128, 0, 255, 102" /> <!-- Match the color on the world map -->
154<FocusColor value="239, 156, 0, 255" /> <!-- Color of the glow around UI controls with keyboard focus --> 154
155<FloaterButtonImageColor value="255, 255, 255, 255" /> <!-- The floater buttons (like the close box) are white images that receive this color. --> 155<!-- MEDIA ICONS -->
156<ButtonCautionImageColor value="255, 255, 255, 255" /> <!-- Match the caution dialog buttons to the default --> 156<IconEnabledColor value="255, 255, 255, 255"/> <!-- Media/music icon enabled -->
157<HealthTextColor value="255, 255, 255, 255" /> 157<IconDisabledColor value="147, 169, 213, 200"/> <!-- Media/music icon disabled -->
158<MapAutopilotColor value="255, 128, 0, 255" /> 158
159<ContextSilhouetteColor value="239, 156, 0, 255" /> <!-- For "context" highlighting, i.e. pie menu --> 159<!-- MINI-MAP -->
160<ScriptBgReadOnlyColor value="180, 180, 180, 255" /> 160<NetMapBackgroundColor value="0, 0, 0, 77" /> <!-- Mini-map floater background -->
161<ParcelTextColor value="40, 40, 90, 255" /> <!-- Parcel name on menu bar, normal state --> 161<NetMapYouOwnAboveWater value="0, 255, 255, 255" /> <!-- Objects owned by you above water -->
162<ParcelHoverColor value="70, 70, 100, 255" /> <!-- Parcel name on menu bar, hover state --> 162<NetMapYouOwnBelowWater value="0, 200, 200, 255" /> <!-- Objects owned by you below water -->
163<TimeTextColor value="0, 30, 60, 255" /> <!-- SL Time on menu bar --> 163<NetMapGroupOwnAboveWater value="255, 0, 255, 255" /> <!-- Group owned objects above water -->
164<BalanceTextColor value="0, 100, 40, 255" /> <!-- Linden dollar balance on menu bar --> 164<NetMapGroupOwnBelowWater value="200, 0, 200, 255" /> <!-- Group owned objects below water -->
165<HealthTextColor value="110, 15, 15, 255" /> <!-- Damage meter text on menu bar --> 165<NetMapOtherOwnAboveWater value="60, 60, 60, 255" /> <!-- Objects owned by others above water -->
166<GroupOverTierColor value="110, 15, 15, 255" /> <!-- Warning text in Group Info window --> 166<NetMapOtherOwnBelowWater value="30, 30, 30, 255" /> <!-- Objects owned by others below water -->
167<FilterBackgroundColor value="75, 75, 150, 180" /> <!-- Matching region of Inventory search text --> 167
168<FilterTextColor value="255, 200, 70, 255" /> 168<!-- INVENTORY -->
169<InventoryItemSuffixColor value="120, 70, 55, 255"/> 169<InventoryBackgroundColor value="255, 255, 255, 80"/> <!-- Inventory floater background -->
170<InventorySearchStatusColor value="0, 0, 0, 255" /> 170<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/> <!-- "loading..." -->
171<ConsoleBackground value="0, 0, 0, 255" /> 171<InventoryItemSuffixColor value="120, 70, 55, 255"/> <!-- "worn", "no modify", etc -->
172<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/> 172<FilterBackgroundColor value="75, 75, 150, 180" /> <!-- Inventory search background -->
173<InventoryBackgroundColor value="255, 255, 255, 80"/> 173<FilterTextColor value="255, 200, 70, 255" /> <!-- Inventory search text -->
174 174<InventorySearchStatusColor value="0, 0, 0, 255" /> <!-- "Searching..." -->
175 <!-- Alert box colors --> 175
176<AlertBoxColor value="165, 180, 200, 245"/> 176<!-- MISC -->
177<AlertTextColor value="0, 30, 60, 255"/> 177<AvatarNameColor value="251, 175, 93, 255" /> <!-- Text color of avatar nametags -->
178<AlertCautionBoxColor value="254, 209, 118, 255"/> <!-- Background color of caution alerts --> 178<FocusColor value="239, 156, 0, 255" /> <!-- Color of the glow around UI controls with keyboard focus -->
179<AlertCautionTextColor value="0, 0, 0, 255"/> <!-- Foreground color of the special title text in caution alerts --> 179<FloaterButtonImageColor value="255, 255, 255, 255" /> <!-- The floater buttons (like the close box) are white images that receive this color. -->
180 180<ButtonCautionImageColor value="255, 255, 255, 255" /> <!-- Match the caution dialog buttons to the default -->
181<!-- Multi sliders, as in the sky animation setting --> 181<MapAutopilotColor value="255, 128, 0, 255" />
182<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/> 182<ContextSilhouetteColor value="239, 156, 0, 255" /> <!-- For "context" highlighting, i.e. pie menu -->
183<MultiSliderThumbCenterColor value="183, 184, 188, 255"/> 183<GroupOverTierColor value="110, 15, 15, 255" /> <!-- Warning text in Group Info window -->
184<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/> 184<ConsoleBackground value="0, 0, 0, 255" /> <!-- Background for inworld chat -->
185<MultiSliderTrackColor value="30, 30, 30, 255"/> 185
186<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/> 186</settings>
187<MultiSliderTriangleColor value="255, 255, 50, 255"/>
188</settings>
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):
26 vals['minor'] = m.group(1) 26 vals['minor'] = m.group(1)
27 m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', data) 27 m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', data)
28 vals['patch'] = m.group(1) 28 vals['patch'] = m.group(1)
29 m = re.search('const char \* const IMP_VERSION_TEST = "(.+)";', data)
30 vals['test'] = m.group(1)
29 31
30 return "%(major)s.%(minor)s.%(patch)s" % vals 32 return "%(major)s.%(minor)s.%(patch)s-%(test)s" % vals
31 33
32if __name__ == '__main__': 34if __name__ == '__main__':
33 import sys 35 import sys
generated by cgit v1.1 at 2024-11-16 06:34:31 +0000