summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorcallum <none@none>2010-12-14 12:57:04 -0800
committercallum <none@none>2010-12-14 12:57:04 -0800
commitd0c7ecb10355940f4e94a72a85e8cb9367d52a57 (patch)
tree3494ccef7ab7b44d2e39b678421b9ce3ff022ffb /indra/newview
parent5dcf11ab4bf5903ff75513f037242cba1e3c11ca (diff)
SOCIAL-366 FIX UI Issues with HTTP Dialogs in Webkit 4.7
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llmediactrl.cpp8
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml2
2 files changed, 9 insertions, 1 deletions
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 &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;[REALM]&apos; requires a user name and password.
<form name="form">
<input name="username" type="text" text="User Name"/>
- <input name="password" type="password" text="Password"/>
+ <input name="password" type="password" text="Password "/>
<button default="true"
index="0"
name="ok"