From 69a86af5eb49744f58d852b04d470ab2c304be2d Mon Sep 17 00:00:00 2001 From: secretfoxtail Date: Fri, 23 Aug 2024 05:15:15 -0600 Subject: Nearby tab quickfix Give avatar_name more space --- indra/newview/skins/default/xui/en/panel_avatar_list_item.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index cfca246321..39b186ecdb 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -64,7 +64,7 @@ top="6" use_ellipses="true" value="(loading)" - width="180" /> + width="100" /> Date: Fri, 23 Aug 2024 05:20:19 -0600 Subject: Blufault - bring back tilebar separators Restore line dividing floater titlebar from the rest of the window --- indra/newview/skins/default/textures/textures.xml | 4 ++-- .../default/textures/windows/Window_Background.png | Bin 6780 -> 7708 bytes .../default/textures/windows/Window_Foreground.png | Bin 6900 -> 8056 bytes .../textures/windows/Window_NoTitle_Background.png | Bin 0 -> 7451 bytes .../textures/windows/Window_NoTitle_Foreground.png | Bin 0 -> 8490 bytes 5 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png create mode 100644 indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 11eafcb45d..b0b7dd51e2 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -780,9 +780,9 @@ with the same filename but different name scale.left="4" scale.top="24" scale.right="26" scale.bottom="4" /> - - diff --git a/indra/newview/skins/default/textures/windows/Window_Background.png b/indra/newview/skins/default/textures/windows/Window_Background.png index f19fb0300b..83b45f9343 100644 Binary files a/indra/newview/skins/default/textures/windows/Window_Background.png and b/indra/newview/skins/default/textures/windows/Window_Background.png differ diff --git a/indra/newview/skins/default/textures/windows/Window_Foreground.png b/indra/newview/skins/default/textures/windows/Window_Foreground.png index 15d2ff72b6..db4b58916f 100644 Binary files a/indra/newview/skins/default/textures/windows/Window_Foreground.png and b/indra/newview/skins/default/textures/windows/Window_Foreground.png differ diff --git a/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png b/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png new file mode 100644 index 0000000000..64afa47b7c Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png differ diff --git a/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png b/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png new file mode 100644 index 0000000000..4478cf0a15 Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png differ -- cgit v1.2.3 From 231c05e492325994c0b1bedd33c3bce0a656b0db Mon Sep 17 00:00:00 2001 From: secretfoxtail Date: Fri, 23 Aug 2024 05:21:33 -0600 Subject: Blufault: Misc icon tweaks Adjust saturation, brightness of some icons. --- .../skins/default/textures/icons/Info_Over.png | Bin 5572 -> 5810 bytes .../skins/default/textures/icons/back_arrow_off.png | Bin 5633 -> 5862 bytes .../skins/default/textures/icons/back_arrow_over.png | Bin 5658 -> 6119 bytes .../skins/default/textures/icons/back_arrow_press.png | Bin 5752 -> 6223 bytes .../skins/default/textures/windows/Inspector_I.png | Bin 5572 -> 5812 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/indra/newview/skins/default/textures/icons/Info_Over.png b/indra/newview/skins/default/textures/icons/Info_Over.png index 82d650ef4b..11bf174ec6 100644 Binary files a/indra/newview/skins/default/textures/icons/Info_Over.png and b/indra/newview/skins/default/textures/icons/Info_Over.png differ diff --git a/indra/newview/skins/default/textures/icons/back_arrow_off.png b/indra/newview/skins/default/textures/icons/back_arrow_off.png index d0d8b31006..0adf0b677e 100644 Binary files a/indra/newview/skins/default/textures/icons/back_arrow_off.png and b/indra/newview/skins/default/textures/icons/back_arrow_off.png differ diff --git a/indra/newview/skins/default/textures/icons/back_arrow_over.png b/indra/newview/skins/default/textures/icons/back_arrow_over.png index 4a247e0f1f..13ce6a8e4d 100644 Binary files a/indra/newview/skins/default/textures/icons/back_arrow_over.png and b/indra/newview/skins/default/textures/icons/back_arrow_over.png differ diff --git a/indra/newview/skins/default/textures/icons/back_arrow_press.png b/indra/newview/skins/default/textures/icons/back_arrow_press.png index 3e9f1a6e96..311a90ac22 100644 Binary files a/indra/newview/skins/default/textures/icons/back_arrow_press.png and b/indra/newview/skins/default/textures/icons/back_arrow_press.png differ diff --git a/indra/newview/skins/default/textures/windows/Inspector_I.png b/indra/newview/skins/default/textures/windows/Inspector_I.png index 82d650ef4b..c36555c90d 100644 Binary files a/indra/newview/skins/default/textures/windows/Inspector_I.png and b/indra/newview/skins/default/textures/windows/Inspector_I.png differ -- cgit v1.2.3 From ec6e4e9d0682851deab96b55b9f57ea4889eb557 Mon Sep 17 00:00:00 2001 From: secretfoxtail Date: Fri, 23 Aug 2024 05:46:15 -0600 Subject: Nearby tab quickfix II Give avatar_name a little more space, stop avatar_distance from being cut off at the edge of the window --- indra/newview/skins/default/xui/en/panel_avatar_list_item.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index 39b186ecdb..51cc6d2257 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -64,7 +64,7 @@ top="6" use_ellipses="true" value="(loading)" - width="100" /> + width="80" /> + width="50" /> Date: Fri, 23 Aug 2024 20:25:24 +0800 Subject: Arrival/departure notifs header links to profiles But I haven't been able to make the body message text stay light grey. It's white now. I've tried changing the chat source, chat type and chat style (refer to indra/llui/llchat.h) but I couldn't get just the desired combined styles. --- indra/newview/llvoavatar.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 4aafe1b1fb..24e1cd83db 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -814,7 +814,13 @@ LLVOAvatar::~LLVOAvatar() { if (gSavedSettings.getBOOL("IMShowArrivalsDepartures") && !getFullname().empty()) { - LLNotificationsUI::LLNotificationManager::instance().onChat(LLChat{llformat("%s left.", getFullname().c_str())}, LLSD{}); + LLAvatarName av_name; + LLAvatarNameCache::get(getID(), &av_name); + auto display_name = av_name.getDisplayName(); + LLChat chat{llformat("%s left.", display_name.c_str())}; + chat.mFromName = display_name; + chat.mFromID = getID(); + LLNotificationsUI::LLNotificationManager::instance().onChat(chat, LLSD{}); } if (!mFullyLoaded) { @@ -2478,8 +2484,13 @@ U32 LLVOAvatar::processUpdateMessage(LLMessageSystem *mesgsys, { if (*id_it == getID() && !isSelf()) { - LLNotificationsUI::LLNotificationManager::instance() - .onChat(LLChat{llformat("%s arrived (%.1f m).", getFullname().c_str(), dist_vec(*pos_it, gAgent.getPositionGlobal()))}, LLSD{}); + LLAvatarName av_name; + LLAvatarNameCache::get(getID(), &av_name); + auto display_name = av_name.getDisplayName(); + LLChat chat{llformat("%s arrived (%.1f m).", display_name.c_str(), dist_vec(*pos_it, gAgent.getPositionGlobal()))}; + chat.mFromName = display_name; + chat.mFromID = getID(); + LLNotificationsUI::LLNotificationManager::instance().onChat(chat, LLSD{}); break; } } -- cgit v1.2.3 From 57f7d83f0b87d596d446c56be44871f2ae0996f4 Mon Sep 17 00:00:00 2001 From: secretfoxtail Date: Fri, 23 Aug 2024 06:31:39 -0600 Subject: Nearby tab quickfix III Play around with various values in attempt to get cleaner, more consistent display of information --- .../skins/default/xui/en/panel_avatar_list_item.xml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index 51cc6d2257..970c6ad2f5 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -64,29 +64,31 @@ top="6" use_ellipses="true" value="(loading)" - width="80" /> + width="0" /> + width="200" /> + width="60" /> Date: Fri, 23 Aug 2024 07:13:04 -0600 Subject: Window_NoTitle_Foreground brightness adjustment Tinting it a touch darker. --- .../textures/windows/Window_NoTitle_Foreground.png | Bin 8490 -> 8707 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png b/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png index 4478cf0a15..c883197d8b 100644 Binary files a/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png and b/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png differ -- cgit v1.2.3 From 5a2aaba40f6b23b9497eceb0cb4e753c1255732e Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Fri, 23 Aug 2024 21:48:07 +0800 Subject: Stream notification header uses title metadata --- indra/llplugin/llpluginclassmedia.cpp | 4 ++++ indra/llplugin/llpluginclassmedia.h | 2 ++ indra/media_plugins/libvlc/media_plugin_libvlc.cpp | 7 +++++++ indra/newview/llviewermedia_streamingaudio.cpp | 6 +++++- indra/newview/llviewermedia_streamingaudio.h | 1 + 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 2da24adbf7..f7f38b83cc 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -1211,6 +1211,10 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) mMediaName = message.getValue("name"); mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_NAME_CHANGED); } + else if(message_name == "title_text") + { + mMediaTitle = message.getValue("title"); + } else if(message_name == "nowplaying_text") { mMediaNowPlaying = message.getValue("nowplaying"); diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 109f3880c5..80862284ff 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -311,6 +311,7 @@ public: const std::string& getMediaName() const { return mMediaName; }; + const std::string& getMediaTitle() const { return mMediaTitle; }; const std::string& getMediaNowPlaying() const { return mMediaNowPlaying; }; std::string getMediaDescription() const { return mMediaDescription; }; @@ -429,6 +430,7 @@ protected: bool mCanPaste; std::string mMediaName; + std::string mMediaTitle; std::string mMediaNowPlaying; std::string mMediaDescription; diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp index 8ae9931dd4..b090734c72 100644 --- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp +++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp @@ -295,6 +295,13 @@ void MediaPluginLibVLC::eventCallbacks(const libvlc_event_t* event, void* ptr) } break; case libvlc_MediaMetaChanged: + auto title = libvlc_media_get_meta(parent->mLibVLCMedia, libvlc_meta_Title); + if (title) + { + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "title_text"); + message.setValue("title", title); + parent->sendMessage(message); + } auto now_playing = libvlc_media_get_meta(parent->mLibVLCMedia, libvlc_meta_NowPlaying); if (now_playing) { diff --git a/indra/newview/llviewermedia_streamingaudio.cpp b/indra/newview/llviewermedia_streamingaudio.cpp index 15b6e3f802..6e3d84b3bf 100644 --- a/indra/newview/llviewermedia_streamingaudio.cpp +++ b/indra/newview/llviewermedia_streamingaudio.cpp @@ -118,8 +118,12 @@ int LLStreamingAudio_MediaPlugins::isPlaying() auto nowPlaying = mMediaPlugin->getMediaNowPlaying(); if (mNowPlaying != nowPlaying) { - LLNotificationsUI::LLNotificationManager::instance().onChat(LLChat{llformat("Now playing %s.", nowPlaying.c_str())}, LLSD{}); + mTitle = mMediaPlugin->getMediaTitle(); mNowPlaying = nowPlaying; + LLChat chat{llformat("Now playing %s.", nowPlaying.c_str())}; + chat.mFromName = mTitle; + chat.mSourceType = CHAT_SOURCE_SYSTEM; + LLNotificationsUI::LLNotificationManager::instance().onChat(chat, LLSD{}); } switch (status) diff --git a/indra/newview/llviewermedia_streamingaudio.h b/indra/newview/llviewermedia_streamingaudio.h index 5abefcdb0b..e1f7cd71d9 100644 --- a/indra/newview/llviewermedia_streamingaudio.h +++ b/indra/newview/llviewermedia_streamingaudio.h @@ -56,6 +56,7 @@ private: LLPluginClassMedia *mMediaPlugin; std::string mURL; + std::string mTitle; std::string mNowPlaying; F32 mGain; }; -- cgit v1.2.3 From c729a1a21c0079b9e47cbc0b44df75c93bcb5383 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Fri, 23 Aug 2024 22:32:01 +0800 Subject: Arrival/departure notifications body text are grey --- indra/newview/llchathistory.cpp | 5 ++++- indra/newview/llvoavatar.cpp | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 4a08eace62..9925a1de47 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -1249,7 +1249,10 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL LLStyle::Params body_message_params; body_message_params.color(txt_color); - body_message_params.readonly_color(txt_color); + if (args["COLOR"]) + body_message_params.readonly_color(LLUIColorTable::instance().getColor(args["COLOR"])); + else + body_message_params.readonly_color(txt_color); body_message_params.font.name(font_name); body_message_params.font.size(font_size); body_message_params.font.style(input_append_params.font.style); diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 24e1cd83db..9dea345954 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -820,7 +820,9 @@ LLVOAvatar::~LLVOAvatar() LLChat chat{llformat("%s left.", display_name.c_str())}; chat.mFromName = display_name; chat.mFromID = getID(); - LLNotificationsUI::LLNotificationManager::instance().onChat(chat, LLSD{}); + LLSD args; + args["COLOR"] = "ChatHistoryTextColor"; + LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args); } if (!mFullyLoaded) { @@ -2490,7 +2492,9 @@ U32 LLVOAvatar::processUpdateMessage(LLMessageSystem *mesgsys, LLChat chat{llformat("%s arrived (%.1f m).", display_name.c_str(), dist_vec(*pos_it, gAgent.getPositionGlobal()))}; chat.mFromName = display_name; chat.mFromID = getID(); - LLNotificationsUI::LLNotificationManager::instance().onChat(chat, LLSD{}); + LLSD args; + args["COLOR"] = "ChatHistoryTextColor"; + LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args); break; } } -- cgit v1.2.3 From 2b0a318facb9b698ed6818be6e0f4488cb6ba272 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Fri, 23 Aug 2024 22:41:33 +0800 Subject: Prevent arrival/departure notifs with empty names --- indra/newview/llvoavatar.cpp | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 9dea345954..5c6b74900f 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -812,17 +812,20 @@ void LLVOAvatar::debugAvatarRezTime(std::string notification_name, std::string c //------------------------------------------------------------------------ LLVOAvatar::~LLVOAvatar() { - if (gSavedSettings.getBOOL("IMShowArrivalsDepartures") && !getFullname().empty()) + if (gSavedSettings.getBOOL("IMShowArrivalsDepartures")) { LLAvatarName av_name; LLAvatarNameCache::get(getID(), &av_name); auto display_name = av_name.getDisplayName(); - LLChat chat{llformat("%s left.", display_name.c_str())}; - chat.mFromName = display_name; - chat.mFromID = getID(); - LLSD args; - args["COLOR"] = "ChatHistoryTextColor"; - LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args); + if (!display_name.empty()) + { + LLChat chat{llformat("%s left.", display_name.c_str())}; + chat.mFromName = display_name; + chat.mFromID = getID(); + LLSD args; + args["COLOR"] = "ChatHistoryTextColor"; + LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args); + } } if (!mFullyLoaded) { @@ -2489,12 +2492,15 @@ U32 LLVOAvatar::processUpdateMessage(LLMessageSystem *mesgsys, LLAvatarName av_name; LLAvatarNameCache::get(getID(), &av_name); auto display_name = av_name.getDisplayName(); - LLChat chat{llformat("%s arrived (%.1f m).", display_name.c_str(), dist_vec(*pos_it, gAgent.getPositionGlobal()))}; - chat.mFromName = display_name; - chat.mFromID = getID(); - LLSD args; - args["COLOR"] = "ChatHistoryTextColor"; - LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args); + if (!display_name.empty()) + { + LLChat chat{llformat("%s arrived (%.1f m).", display_name.c_str(), dist_vec(*pos_it, gAgent.getPositionGlobal()))}; + chat.mFromName = display_name; + chat.mFromID = getID(); + LLSD args; + args["COLOR"] = "ChatHistoryTextColor"; + LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args); + } break; } } -- cgit v1.2.3