From d0c7ecb10355940f4e94a72a85e8cb9367d52a57 Mon Sep 17 00:00:00 2001 From: callum Date: Tue, 14 Dec 2010 12:57:04 -0800 Subject: SOCIAL-366 FIX UI Issues with HTTP Dialogs in Webkit 4.7 --- indra/newview/llmediactrl.cpp | 8 ++++++++ indra/newview/skins/default/xui/en/notifications.xml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index e916f3251e..340c9e7d5c 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -1144,6 +1144,14 @@ void LLMediaCtrl::showNotification(LLNotificationPtr notify) params.text_color = LLColor4::black; } else + //HACK: another one since XUI doesn't support what we need right now + if (notify->getName() == "AuthRequest") + { + params.bg_image.name = "Yellow_Gradient"; + params.text_color = LLColor4::black; + params.can_close = false; + } + else { //HACK: make this a property of the notification itself, "cancellable" params.can_close = false; diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 76f221f481..4321fb12d2 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6580,7 +6580,7 @@ Mute everyone? The site at '<nolink>[HOST_NAME]</nolink>' in realm '[REALM]' requires a user name and password.
- +