From ff6369f5a7b711b1a185d6652446e9e186f91333 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 2 Dec 2016 15:53:41 -0500 Subject: show the build address size in the About box --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 9b3fb06bdf..00237d493a 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -25,7 +25,7 @@ [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL]) [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] - Build Configuration [BUILD_CONFIG] + Build Configuration [BUILD_CONFIG] [ADDRESS_SIZE] bits You are at [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] located at <nolink>[HOSTNAME]</nolink> ([HOSTIP]) -- cgit v1.2.3 From 1d6c68449e9caba2b9017d4b71fe827bf6fa9771 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 9 Dec 2016 08:17:05 -0500 Subject: Simplify version line in the About box, add address size to it --- indra/newview/skins/default/xui/en/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index a45c697ddb..83711651ab 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -22,10 +22,10 @@ -[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL]) +[CHANNEL] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([ADDRESS_SIZE]bit) [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] - Build Configuration [BUILD_CONFIG] [ADDRESS_SIZE] bits + Build Configuration [BUILD_CONFIG] You are at [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] located at <nolink>[HOSTNAME]</nolink> ([HOSTIP]) -- cgit v1.2.3 From dcae92c0a306aaf6447089b340913d4a678855ac Mon Sep 17 00:00:00 2001 From: Callum Linden Date: Fri, 27 Jan 2017 15:47:16 -0800 Subject: First batch of changes to add LibVLC media plugin to macOS viewer. Plugin fails to start because of an as-yet undiagnosed issue with VLC plugin files related to their extyended attributes --- .../skins/default/xui/en/mime_types_mac.xml | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/mime_types_mac.xml b/indra/newview/skins/default/xui/en/mime_types_mac.xml index f71c24b2e4..2d96708b86 100644 --- a/indra/newview/skins/default/xui/en/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/en/mime_types_mac.xml @@ -130,7 +130,7 @@ movie - media_plugin_quicktime + media_plugin_libvlc @@ -141,7 +141,7 @@ none - media_plugin_quicktime + media_plugin_libvlc @@ -163,7 +163,7 @@ audio - media_plugin_quicktime + media_plugin_libvlc @@ -174,7 +174,7 @@ movie - media_plugin_quicktime + media_plugin_libvlc @@ -196,7 +196,7 @@ movie - media_plugin_quicktime + media_plugin_libvlc @@ -218,7 +218,7 @@ audio - media_plugin_quicktime + media_plugin_libvlc @@ -295,7 +295,7 @@ audio - media_plugin_quicktime + media_plugin_libvlc @@ -306,7 +306,7 @@ audio - media_plugin_quicktime + media_plugin_libvlc @@ -317,7 +317,7 @@ audio - media_plugin_quicktime + media_plugin_libvlc @@ -328,7 +328,7 @@ audio - media_plugin_quicktime + media_plugin_libvlc @@ -438,7 +438,7 @@ movie - media_plugin_quicktime + media_plugin_libvlc @@ -449,7 +449,7 @@ movie - media_plugin_quicktime + media_plugin_libvlc @@ -460,7 +460,7 @@ movie - media_plugin_quicktime + media_plugin_libvlc @@ -471,7 +471,7 @@ movie - media_plugin_quicktime + media_plugin_libvlc @@ -482,7 +482,7 @@ movie - media_plugin_quicktime + media_plugin_libvlc @@ -493,7 +493,7 @@ movie - media_plugin_quicktime + media_plugin_libvlc -- cgit v1.2.3 From 5534ab4e182b8403cf0ed514059e346d55f18162 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Tue, 21 Feb 2017 15:06:21 -0800 Subject: First round of changes to replace LLCEFLib with Dullahan. Mostly Windows changes in this batch since I'm working on Windows box but some speculative macOS ones too although they are quite untested --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 6b3422d892..c19ab5a570 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -61,7 +61,7 @@ VFS (cache) creation time: [VFS_TIME] J2C Decoder Version: [J2C_VERSION] Audio Driver Version: [AUDIO_DRIVER_VERSION] -LLCEFLib/CEF Version: [LLCEFLIB_VERSION] +CEF Version: [LIBCEF_VERSION] LibVLC Version: [LIBVLC_VERSION] Voice Server Version: [VOICE_VERSION] -- cgit v1.2.3 From 062c345556ef74d33f6cdcaaae513211ced7c410 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Tue, 14 Mar 2017 12:37:52 -0700 Subject: Tweak CEF plugin version to include Chrome equivalent --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 2ae78901f6..9533407c51 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -61,7 +61,7 @@ VFS (cache) creation time: [VFS_TIME] J2C Decoder Version: [J2C_VERSION] Audio Driver Version: [AUDIO_DRIVER_VERSION] -CEF Version: [LIBCEF_VERSION] +[LIBCEF_VERSION] LibVLC Version: [LIBVLC_VERSION] Voice Server Version: [VOICE_VERSION] -- cgit v1.2.3 From c49eeb9a6202c5c38338ef229851bd84901ee24c Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Wed, 19 Apr 2017 15:59:29 -0700 Subject: Add back the missing pieces and updated code for the example plugin. It was useful during testing SLPlugin changes. Not shipped with release versions of viewer --- indra/newview/skins/default/xui/en/mime_types.xml | 35 +++++++++++++++-------- 1 file changed, 23 insertions(+), 12 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml index 8d8d546b24..8a810f32a6 100644 --- a/indra/newview/skins/default/xui/en/mime_types.xml +++ b/indra/newview/skins/default/xui/en/mime_types.xml @@ -133,18 +133,29 @@ media_plugin_libvlc - - - - movie - - - media_plugin_libvlc - - - + + + + movie + + + media_plugin_example + + + + + + movie + + + media_plugin_libvlc + + + -- cgit v1.2.3