diff options
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_publish_classified.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 168 | 
2 files changed, 86 insertions, 84 deletions
| diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml index 6ce9ed6e77..322e34272c 100644 --- a/indra/newview/skins/default/xui/en/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml @@ -36,7 +36,7 @@ Remember, Classified fees are non-refundable.       left="15"       value="50"       min_val="50" -     max_val="99999" +     max_val="999999"       name="price_for_listing"       top_pad="10"       tool_tip="Price for listing." diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 64438fe614..41a90f5984 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2297,8 +2297,8 @@ Would you be my friend?   icon="alertmodal.tga"   label="Save Outfit"   name="SaveOutfitAs" - type="alertmodal" - unique="true"> + type="alertmodal"> +    <unique/>      Save what I'm wearing as a new Outfit:      <tag>confirm</tag>      <form name="form"> @@ -4611,8 +4611,8 @@ Go to your [http://secondlife.com/account/ Dashboard] to see your account histor    <notification     icon="alertmodal.tga"     name="ConfirmQuit" -   type="alertmodal" -   unique="true"> +   type="alertmodal"> +    <unique/>  Are you sure you want to quit?      <tag>confirm</tag>      <usetemplate @@ -4625,8 +4625,8 @@ Are you sure you want to quit?    <notification     icon="alertmodal.tga"     name="DeleteItems" -   type="alertmodal" -   unique="true"> +   type="alertmodal"> +    <unique/>      [QUESTION]      <tag>confirm</tag>      <usetemplate @@ -4639,8 +4639,9 @@ Are you sure you want to quit?    <notification     icon="alertmodal.tga"     name="HelpReportAbuseEmailLL" -   type="alert" -   unique="true"> +   type="alert"> +    <unique/> +      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. @@ -5615,8 +5616,8 @@ Message from [NAME]:     icon="notify.tga"     name="NotSafe"     persist="true" -   type="notify" -   unique="true"> +   type="notify"> +    <unique/>  This land has damage enabled.  You can be hurt here. If you die, you will be teleported to your home location.    </notification> @@ -5625,8 +5626,8 @@ You can be hurt here. If you die, you will be teleported to your home location.     icon="notify.tga"     name="NoFly"     persist="true" -   type="notify" -   unique="true"> +   type="notify"> +    <unique/>     <tag>fail</tag>  This area has flying disabled.  You can't fly here. @@ -5636,8 +5637,8 @@ You can't fly here.     icon="notify.tga"     name="PushRestricted"     persist="true" -   type="notify" -   unique="true"> +   type="notify"> +    <unique/>      This area does not allow pushing. You can't push others here unless you own the land.    </notification> @@ -5645,8 +5646,8 @@ This area does not allow pushing. You can't push others here unless you own     icon="notify.tga"     name="NoVoice"     persist="true" -   type="notify" -   unique="true"> +   type="notify"> +    <unique/>      This area has voice chat disabled. You won't be able to hear anyone talking.      <tag>voice</tag>    </notification> @@ -5655,8 +5656,8 @@ This area has voice chat disabled. You won't be able to hear anyone talking     icon="notify.tga"     name="NoBuild"     persist="true" -   type="notify" -   unique="true"> +   type="notify"> +    <unique/>      This area has building disabled. You can't build or rez objects here.    </notification> @@ -5664,8 +5665,8 @@ This area has building disabled. You can't build or rez objects here.     icon="notify.tga"     name="SeeAvatars"     persist="true" -   type="notify" -   unique="true"> +   type="notify"> +    <unique/>      This parcel hides avatars and text chat from another parcel.   You can't see other residents outside the parcel, and those outside are not able to see you.  Regular text chat on channel 0 is also blocked.    </notification> @@ -6553,8 +6554,8 @@ The voice call you are trying to join, [VOICE_CHANNEL_NAME], has reached maximum    <notification     icon="notifytip.tga"     name="ProximalVoiceChannelFull" -   type="notifytip" -   unique="true"> +   type="notifytip"> +    <unique/>      We're sorry.  This area has reached maximum capacity for voice conversations.  Please try to use voice in another area.      <tag>fail</tag>      <tag>voice</tag> @@ -6622,8 +6623,8 @@ Failed to connect to [VOICE_CHANNEL_NAME], please try again later.  You will now     duration="10"     icon="notifytip.tga"     name="VoiceLoginRetry" -   type="notifytip" -   unique="true"> +   type="notifytip"> +    <unique/>      We are creating a voice channel for you. This may take up to one minute.    <tag>status</tag>    <tag>voice</tag> @@ -6634,8 +6635,8 @@ We are creating a voice channel for you. This may take up to one minute.     name="VoiceEffectsExpired"     sound="UISndAlert"     persist="true" -   type="notify" -   unique="true"> +   type="notify"> +    <unique/>      One or more of your subscribed Voice Morphs has expired.  [[URL] Click here] to renew your subscription.    <tag>fail</tag> @@ -6647,8 +6648,8 @@ One or more of your subscribed Voice Morphs has expired.     name="VoiceEffectsExpiredInUse"     sound="UISndAlert"     persist="true" -   type="notify" -   unique="true"> +   type="notify"> +    <unique/>  The active Voice Morph has expired, your normal voice settings have been applied.  [[URL] Click here] to renew your subscription.      <tag>fail</tag> @@ -6660,8 +6661,8 @@ The active Voice Morph has expired, your normal voice settings have been applied     name="VoiceEffectsWillExpire"     sound="UISndAlert"     persist="true" -   type="notify" -   unique="true"> +   type="notify"> +    <unique/>      One or more of your Voice Morphs will expire in less than [INTERVAL] days.  [[URL] Click here] to renew your subscription.    <tag>fail</tag> @@ -6673,8 +6674,8 @@ One or more of your Voice Morphs will expire in less than [INTERVAL] days.     name="VoiceEffectsNew"     sound="UISndAlert"     persist="true" -   type="notify" -   unique="true"> +   type="notify"> +    <unique/>      New Voice Morphs are available!     <tag>voice</tag>    </notification> @@ -7075,8 +7076,9 @@ Are you sure you want to leave this call?       ignoretext="Confirm before I leave call"       name="okcancelignore"       notext="No" -     yestext="Yes" -     unique="true"/> +     yestext="Yes"> +      <unique/> +    </usetemplate>    </notification>    <notification @@ -7095,31 +7097,31 @@ Mute everyone?       ignoretext="Confirm before I mute all participants in a group call"       name="okcancelignore"       yestext="Ok" -     notext="Cancel" -     unique="true"/> +     notext="Cancel"> +      <unique/> +    </usetemplate>    </notification>    <notification    name="HintChat"    label="Chat" -  type="hint" -  unique="true"> +  type="hint"> +    <unique/>      To join the conversation, type into the chat field below.    </notification>    <notification    name="HintSit" -      label="Stand" -  type="hint" -  unique="true"> +  type="hint"> +    <unique/>      To stand up and exit the sitting position, click the Stand button.    </notification>    <notification    name="HintSpeak"    label="Speak" -  type="hint" -  unique="true"> +  type="hint"> +    <unique/>      Click the Speak button to turn your microphone on and off.  Click on the up arrow to see the voice control panel. @@ -7130,32 +7132,32 @@ Hiding the Speak button will disable the voice feature.    <notification    name="HintDestinationGuide"    label="Explore the World" -  type="hint" -  unique="true"> +  type="hint"> +    <unique/>      The Destination Guide contains thousands of new places to discover. Select a location and choose Teleport to start exploring.    </notification>    <notification      name="HintSidePanel"      label="Side Panel" -    type="hint" -    unique="true"> +    type="hint"> +    <unique/>      Get quick access to your inventory, outfits, profiles and more in the side panel.    </notification>    <notification    name="HintMove"    label="Move" -  type="hint" -  unique="true"> +  type="hint"> +    <unique/>      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.    </notification>    <notification    name="HintMoveClick"    label="" -  type="hint" -  unique="true"> +  type="hint"> +    <unique/>      1. Click to Walk  Click anywhere on the ground to walk to that spot. @@ -7167,8 +7169,8 @@ Click and drag anywhere on the world to rotate your view    <notification    name="HintDisplayName"    label="Display Name" -  type="hint" -  unique="true"> +  type="hint"> +    <unique/>      Set your customizable display name here. This is in addition to your unique username, which can't be changed. You can change how you see other people's names in your preferences.    </notification> @@ -7176,8 +7178,8 @@ Click and drag anywhere on the world to rotate your view    <notification    name="HintView"    label="View" -  type="hint" -  unique="true"> +  type="hint"> +    <unique/>      To change your camera view, use the Orbit and Pan controls. Reset your view by pressing Escape or walking.      <tag>custom_skin</tag>    </notification> @@ -7185,16 +7187,16 @@ Click and drag anywhere on the world to rotate your view    <notification    name="HintInventory"    label="Inventory" -  type="hint" -  unique="true"> +  type="hint"> +    <unique/>      Check your inventory to find items. Newest items can be easily found in the Recent tab.    </notification>    <notification    name="HintLindenDollar"    label="You've got Linden Dollars!" -  type="hint" -  unique="true"> +  type="hint"> +    <unique/>      Here's your current balance of L$. Click Buy L$ to purchase more Linden Dollars.      <tag>funds</tag>    </notification> @@ -7383,8 +7385,8 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm '    <notification   name="ModeChange"   label="" - type="alertmodal" - unique="true"> + type="alertmodal"> +    <unique/>      Changing modes requires you to quit and restart.      <tag>confirm</tag>      <usetemplate @@ -7396,8 +7398,8 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm '    <notification   name="NoClassifieds"   label="" - type="alertmodal" - unique="true"> + type="alertmodal"> +    <unique/>      <tag>fail</tag>      <tag>confirm</tag>      Creation and editing of Classifieds is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen. @@ -7410,8 +7412,8 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm '    <notification   name="NoGroupInfo"   label="" - type="alertmodal" - unique="true"> + type="alertmodal"> +    <unique/>      <tag>fail</tag>      <tag>confirm</tag>      Creation and editing of Groups is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen. @@ -7424,8 +7426,8 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm '    <notification   name="NoPlaceInfo"   label="" - type="alertmodal" - unique="true"> + type="alertmodal"> +    <unique/>      <tag>fail</tag>      <tag>confirm</tag>      Viewing place profile is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen. @@ -7438,8 +7440,8 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm '    <notification   name="NoPicks"   label="" - type="alertmodal" - unique="true"> + type="alertmodal"> +    <unique/>      <tag>fail</tag>      <tag>confirm</tag>      Creation and editing of Picks is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen. @@ -7452,8 +7454,8 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm '    <notification   name="NoWorldMap"   label="" - type="alertmodal" - unique="true"> + type="alertmodal"> +    <unique/>      <tag>fail</tag>      <tag>confirm</tag>      Viewing of the world map is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen. @@ -7466,8 +7468,8 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm '    <notification   name="NoVoiceCall"   label="" - type="alertmodal" - unique="true"> + type="alertmodal"> +    <unique/>      <tag>fail</tag>      <tag>confirm</tag>      Voice calls are only available in Advanced mode. Would you like to logout and change modes? @@ -7480,8 +7482,8 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm '    <notification   name="NoAvatarShare"   label="" - type="alertmodal" - unique="true"> + type="alertmodal"> +    <unique/>      <tag>fail</tag>      <tag>confirm</tag>      Sharing is only available in Advanced mode. Would you like to logout and change modes? @@ -7494,8 +7496,8 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm '    <notification   name="NoAvatarPay"   label="" - type="alertmodal" - unique="true"> + type="alertmodal"> +    <unique/>      <tag>fail</tag>      <tag>confirm</tag>  	  Paying other residents is only available in Advanced mode. Would you like to logout and change modes? @@ -7508,8 +7510,8 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm '    <notification   name="NoInventory"   label="" - type="alertmodal" - unique="true"> + type="alertmodal"> +    <unique/>      <tag>fail</tag>      <tag>confirm</tag>      Viewing inventory is only available in Advanced mode. Would you like to logout and change modes? @@ -7522,8 +7524,8 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm '    <notification   name="NoAppearance"   label="" - type="alertmodal" - unique="true"> + type="alertmodal"> +    <unique/>      <tag>fail</tag>      <tag>confirm</tag>      The appearance editor is only available in Advanced mode. Would you like to logout and change modes? @@ -7536,8 +7538,8 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm '    <notification   name="NoSearch"   label="" - type="alertmodal" - unique="true"> + type="alertmodal"> +    <unique/>      <tag>fail</tag>      <tag>confirm</tag>      Search is only available in Advanced mode. Would you like to logout and change modes? | 
