From d3f06b296203c08c900c4e569ce5df0ac2f27715 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Mon, 12 Dec 2011 17:04:58 -0800 Subject: Fixed marketplace URL trailing '/' and updated to latest window shade code from viewer-experience --- indra/newview/llfloateroutbox.cpp | 4 ++-- indra/newview/skins/default/xui/en/strings.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp index b10ef0ba64..972e1e8cdc 100644 --- a/indra/newview/llfloateroutbox.cpp +++ b/indra/newview/llfloateroutbox.cpp @@ -418,14 +418,14 @@ void LLFloaterOutbox::showNotification(LLNotificationPtr notify) params.name = "notification_shade"; params.rect = floater_rect; params.follows.flags = FOLLOWS_ALL; - params.notification = notify; params.modal = true; params.can_close = false; + params.shade_color = LLColor4::white % 0.25f; params.text_color = LLColor4::white; mWindowShade = LLUICtrlFactory::create(params); addChild(mWindowShade); - mWindowShade->show(); + mWindowShade->show(notify); } diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 7dd965de84..3c7465cd7c 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2029,7 +2029,7 @@ Returns a string with the requested data about the region Drag a landmark here to add it to your favorites. You do not have a copy of this texture in your inventory When you purchase or otherwise receive an item, it will appear here so you can drag it to a folder in your inventory, or delete it if you do not wish to keep it. - https://marketplace.[MARKETPLACE_DOMAIN_NAME] + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ https://marketplace.[MARKETPLACE_DOMAIN_NAME]/create_store https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/[AGENT_ID]/store/dashboard https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more -- cgit v1.2.3