summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
AgeCommit message (Collapse)Author
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-19merge changes for 3.6.3-releaseOz Linden
2013-07-02MAINT-528 added syntax highlighting for STATUS_BLOCK_GRAB_OBJECT and ↵Maestro Linden
corrected related tooltips
2013-07-09CHUI-978 FIXED Load data from chat log file in separate thread to prevent ↵Mnikolenko ProductEngine
viewer freeze
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2013-06-19Pull merge lindenlab/viewer-releaseMerov Linden
2013-06-13CHUI-809 (Right-click menu on user name in compat chat mode doesn't have "IM")mberezhnoy
Added callback for friendship checking
2013-05-11Merge viewer-dev-materials and bugfix in LLPanelFace::getState using ↵Graham Madarasz
material instead of mMaterial
2013-05-10merge changes for 3.5.2-beta4Oz Linden
2013-05-09Merge downstream code and viewer-betasimon
2013-05-09Merge viewer-betasimon
2013-05-03mergeKelly Washington
2013-05-03MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ↵Kelly Washington
LSL permissions * Change text of dialog * Add callback for mute button reviewed with Richard and Widely.
2013-04-30MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ↵Kelly Washington
LSL permissions * Add the newer run time permissions to the viewer * Filter requested permissions by those the viewer knows about * Show a dialog indicating unknown permissions were requested and a new viewer will be needed to grant them. reviewed with Simon and Soft
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-30Fix vwr-dev-mat merge bugs in llpanelface (missing Oz fix) and XMLGraham Madarasz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-11Forgot to commit @#! mergesimon
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
2013-04-01merge changes for 3.5.0-beta7Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-25Pull in downstream CHUI code from viewer-developmentsimon
2013-03-19Merge in viewer-beta to get CHUI codeSimon Linden
2013-03-19MAINT-2506 added viewer support for PERMISSION_SILENT_ESTATE_MANAGEMENT and ↵Maestro Linden
PERMISSION_OVERRIDE_ANIMATIONS. Reviewed by Simon.
2013-03-11Viewer-chui mergeprep
2013-03-09Dynamically add and remove "Use texture" normal/specular setting.Tonya Souther
2013-02-28SH-3909 Support avatar height offsetNyx Linden
Adding a new visual param that allows users to manually adjust an offset for how far off the ground (+ or -) their avatar's root bone is. Supports the +-2m range people are used to adjusting in their viewers, but new implementation should support server-generated appearances.
2013-02-06CHUI-597 (Messages shown in Conversation Log are inaccurate)mberezhnoy
Added messages, for now they're displayed in two cases: 1) no log entries, logging disabled 2) no log entries, logging enabled Case when there are existing log entries and logging is disabled is still under discussion
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2012-12-13MAINT-2109 Added ATTACH_NECK and ATTACH_AVATAR_CENTER definitions for LSL ↵Maestro Linden
scripts and script information floater. Reviewed by Andrew.
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-12-04CHUI-527 FIXED Changed term to "Multi-person chat"maxim@mnikolenko
2012-11-20Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-15CHUI-518: WIP First pass as implementing auto-reject voice calls in do not ↵William Todd Stinson
disturb mode.
2012-11-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-09CHUI-517: Updating the copy for the avatar in-world name bubble status for ↵William Todd Stinson
Do Not Disturb mode.
2012-11-09CHUI-517: Updating the do not disturb message automatically sent to other ↵William Todd Stinson
users when they attempt to contact a person in do not disturb mode.
2012-11-09CHUI-517: Altering the behavior and copy of the main menu status choices. ↵William Todd Stinson
Busy has been replaced with Do Not Disturb. And both status options have been switched to be indicated with a check rather than alternating text.
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-18CHUI-329: Post code review commit, instead of hard coded the parenthesis, ↵Gilbert Gonzales
created a custom string in string.xml. The reasoning for this is because some languages may not use the parenthesis or perhaps even use brackets if needed...basically allows for flexibility.
2012-09-06Mergesimon@Simon-PC.lindenlab.com
2012-10-16Reference new "[sourceid]" substitution in "create_account_url".Nat Goodspeed
join.secondlife.com needs to know the sourceid as well as the user's language of choice. Ensure that sourceid gets passed with the URL.
2012-09-06MAINT-1183 FIXED Tooltip text is changedmaxim_productengine
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-09CHUI-171 WIP (Conversation not automatically readded to conversation window ↵AlexanderP ProductEngine
listing when open) - removal of the dependence between items of the conversations list and conversation's floaters.
2012-08-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-07-31merge up to latest viewer-developmentOz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 14:52:28 +0000