summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
AgeCommit message (Collapse)Author
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-25[MAINT-2233] Duplicate entries in notifications.xmlChris Baker
- Removed duplicate notification elements
2013-01-24CHUI-578 FIXED Move preferences for conversation logs/transcripts to chat tabmaksymsproductengine
2013-01-10Merge pull from lindenlab/viewer-betaMerov Linden
2012-12-19Switching some notification types from "offer" to be "notify" as the ↵William Todd Stinson
notifications were not offers.
2012-12-18Removing copy from the DoNotDisturbModeSet notification as we are no longer ↵William Todd Stinson
auto deleting inventory offers.
2012-12-04Pull in upstream viewer-development via viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-30MAINT-1991 Attempt to mitigate crashes in GL drivers by encouraging people ↵Dave Parks
to update their drivers. Reviewed by Simon
2012-11-16Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-11-15CHUI-518: WIP First pass as implementing auto-reject voice calls in do not ↵William Todd Stinson
disturb mode.
2012-11-15CHUI-489: Now sounds exist for teleport and inventory offers. The sound is ↵Gilbert Gonzales
specified in notifications.xml. Also changes for CHUI 486, which allow the user to set preferences for hearing sounds for a New Conversation, Incoming Voice Call, Teleport Offer and Inventory Offer.
2012-11-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-09CHUI-517: Updating notification copy for Do Not Disturb mode.William Todd Stinson
2012-11-08CHUI-484: Updating the code to rather than refer to it as Busy Mode, it now ↵William Todd Stinson
refers to it as Do Not Disturb mode.
2012-10-18MAINT-1615 - Something invisible pushes avatars around on Dorevoidpointer
2012-10-17Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-16MAINT-1737: Adding a menu option to the Pathfinding menu to allow rebuilding ↵William Todd Stinson
of the region's navmesh.
2012-09-24Fixed a localized message that wasn't correct.Chris Baker
2012-09-24Converted more hard-coded stringsChris Baker
2012-09-20Pull and merge from ↵William Todd Stinson
ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-20Fix up messages altered for testingsimon@Simon-PC.lindenlab.com
2012-09-20[MAINT-1562] Convert more hard-coded alert messages to be localizedChris Baker
Related chagesets: http://hg.lindenlab.com/baker/honeybadger/changeset/74c398c712b6 Description: - Updated english notifications.xml with alerts from the related changeset above.
2012-09-20MAINT-1589 - Update debit permissions dialog (residents deemed frightening).simon@Simon-PC.lindenlab.com
Removed sentence as per jira. Also removed "persist" tag from new localized alert strings since they shouldn't persist.
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-09-07MAINT-1494 : Viewer needs new localizable stringssimon@Simon-PC.lindenlab.com
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-08-24MAINT-1400 FIXED duplicated IDs in two files: notifications.xml and ↵MaksymS ProductEngine
floater_texture_ctrl.xml
2012-08-21CHUI-293 CHUI-294 FIXED displaying Group Invite and Transfer Object as ↵Seth ProductEngine
notifications, instead of displaying as messages from an object. Restored the exception in handling "LoadWebPage", "ScriptDialog" and "ScriptDialogGroup" notifications, that caused only those notifications to be shown as messages from an object.
2012-08-20merge back beta fixesOz Linden
2012-08-20Automated merge with ssh://hg.lindenlab.com/richard/viewer-chuiSeth ProductEngine
2012-08-16merge changes for DRTVWR-197Oz Linden
2012-08-14PATH-856: Adding a new notification to indicate when the user will be ↵Todd Stinson
toggling the phantom flag of a linkset through the Pathfinding Linksets floater.
2012-08-14merge back beta fixesOz Linden
2012-08-09MAINT-1342: correct initial login location handling, clarify the two related ↵Oz Linden
persistent settings
2012-08-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-08-09CHUI-120 WIP Added notifications about newly invited chat participants.Seth ProductEngine
2012-08-03Make first-login popup button "Create Account"; remove embedded link.Nat Goodspeed
Popup text used to end with the question: Visit [[create_account_url] [SECOND_LIFE] web site] to create a new account? presumably to set context for the buttons labeled "New Account..." and "Continue". At Leo's request, remove the question and relabel the yes button "Create Account...".
2012-08-02Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-07-31CHUI-258: Ensuring that the teleport lure requests are logged to IM and not ↵Todd Stinson
to nearby chat.
2012-07-30CHUI-258: Adding a method to better whether nearby chat is visible or not.Todd Stinson
2012-07-27Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-24merge to viewer-developmentoOz Linden
2012-07-24Engage dormant first-login-this-install popup message.Nat Goodspeed
Although the XUI for this popup, and the code to display and respond to it, have been present from the first rev in the current viewer repository, I can find no trace of it ever having been called. Reword embedded link in popup message in each supported language: directly mentioning secondlife.com in display text engages anti-URL-spoofing logic, causing the popup to display the whole messy URL with sourceid and lang params. Change to say "Second Life web site" instead -- needs translations.
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-11Pull in viewer-development because it's painful. Merge with runitai's help.simon@Simon-PC.lindenlab.com
2012-06-29Use [create_account_url] from strings.xml consistently in notifications.xml.Nat Goodspeed
The URL whose simple form is http://join.secondlife.com actually appears in a number of places in the localized notifications.xml files. It's supposed to be localized for the current viewer language -- and in strings.xml, it is. But the same URL is restated a couple times in notifications.xml, sometimes localized, sometimes not. Add "create_account_url" to init_default_trans_args(), permitting us to embed [create_account_url] anywhere in the skin files. Then replace all known occurrences of that URL in notifications.xml files with [create_account_url].
2012-06-28mergeDave Parks
2012-06-27Minor changes to pathfinding-specific wordings.Todd Stinson