diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-12-12 17:04:58 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-12 17:04:58 -0800 |
| commit | d3f06b296203c08c900c4e569ce5df0ac2f27715 (patch) | |
| tree | c870d0aba0a425f4988dab1d2b19e63ee3f03573 /indra/newview | |
| parent | 90b8fb07ccd46bd18f3629ae2ec04a47312b41cb (diff) | |
Fixed marketplace URL trailing '/' and updated to latest window shade code from viewer-experience
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloateroutbox.cpp | 4 | ||||
| -rw-r--r-- | 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<LLWindowShade>(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 <string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string> <string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string> <string name="InventoryInboxNoItems">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.</string> - <string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]</string> + <string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string> <string name="MarketplaceURL_CreateStore">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/create_store</string> <string name="MarketplaceURL_Dashboard">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/[AGENT_ID]/store/dashboard</string> <string name="MarketplaceURL_LearnMore">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more</string> |