From 7b7d8ffc22d3af3186f96d57f1276411f558d6f1 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 16 Sep 2010 16:51:07 -0700 Subject: EXP-73 FIX hint cannot be dismissed with X and crashes browser when hint is triggered by user taking an object from inworld into inventory --- indra/llui/llnotificationtemplate.h | 10 ++- .../newview/skins/default/xui/en/notifications.xml | 99 +++++++++++----------- 2 files changed, 58 insertions(+), 51 deletions(-) diff --git a/indra/llui/llnotificationtemplate.h b/indra/llui/llnotificationtemplate.h index 4a020bfe70..a4d393f874 100644 --- a/indra/llui/llnotificationtemplate.h +++ b/indra/llui/llnotificationtemplate.h @@ -74,10 +74,18 @@ struct LLNotificationTemplate struct UniquenessContext : public LLInitParam::Block { + private: + // this idiom allows + // + // as well as + // ... + Optional dummy_val; + public: Mandatory key; UniquenessContext() - : key("key") + : key("key"), + dummy_val("") {} }; diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index a2a5015d06..9d947480b3 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2059,7 +2059,8 @@ Would you be my friend? icon="alertmodal.tga" label="Save Outfit" name="SaveOutfitAs" - type="alertmodal"> + type="alertmodal" + unique="true"> Save what I'm wearing as a new Outfit:
@@ -2075,7 +2076,6 @@ Would you be my friend? name="Cancel" text="Cancel"/>
- + type="alertmodal" + unique="true"> Are you sure you want to quit? - + type="alertmodal" + unique="true"> [QUESTION] - + type="alert" + unique="true"> Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards]. All reported abuses are investigated and resolved. - + type="notify" + unique="true"> This land has damage enabled. You can be hurt here. If you die, you will be teleported to your home location. - + type="notify" + unique="true"> This area has flying disabled. You can't fly here. - + type="notify" + unique="true"> This area does not allow pushing. You can't push others here unless you own the land. - + type="notify" + unique="true"> This area has voice chat disabled. You won't be able to hear anyone talking. - + type="notify" + unique="true"> This area has building disabled. You can't build or rez objects here. - + type="notifytip" + unique="true"> We're sorry. This area has reached maximum capacity for voice conversations. Please try to use voice in another area. - + type="notifytip" + unique="true"> We are creating a voice channel for you. This may take up to one minute. - + type="notify" + unique="true"> One or more of your subscribed Voice Morphs has expired. [[URL] Click here] to renew your subscription. - + type="notify" + unique="true"> The active Voice Morph has expired, your normal voice settings have been applied. [[URL] Click here] to renew your subscription. - + type="notify" + unique="true"> One or more of your Voice Morphs will expire in less than [INTERVAL] days. [[URL] Click here] to renew your subscription. - + type="notify" + unique="true"> New Voice Morphs are available! - - + yestext="Yes" + unique="true"/> - + notext="Cancel" + unique="true"/> + type="hint" + unique="true"> To join the conversation, type into the chat field below. - + type="hint" + unique="true"> To stand up and exit the sitting position, click the Stand button. - + type="hint" + unique="true"> The Destination Guide contains thousands of new places to discover. Select a location and choose Teleport to start exploring. - + type="hint" + unique="true"> Get quick access to your inventory, outfits, profiles and more in the side panel. - + type="hint" + unique="true"> To walk or run, open the Move Panel and use the directional arrows to navigate. You can also use the directional keys on your keyboard. - + type="hint" + unique="true"> Check your inventory to find items. Newest items can be easily found in the Recent tab. - + type="hint" + unique="true"> Here's your current balance of L$. Click Buy L$ to purchase more Linden Dollars. - + unique="true"> A pop-up was prevented from opening. -