summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
AgeCommit message (Collapse)Author
2014-03-12merge with releaseRichard Linden
2014-02-12merge with releaseRichard Linden
2013-11-21MAINT-3480 FIXED Duplicated strings are deletedMnikolenko ProductEngine
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-11-11MAINT-3432 FIX Help -> Report Bug should open jira with pre-populated fieldsRichard Linden
moved viewer information strings into LLAppViewer replaced Help>Report a Bug with direct use of Jira link
2013-11-06merge with releaseRichard Linden
2013-10-17Pull merge from oz_linden/336-snowstormMerov Linden
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-10-08merge from viewer-releaseRichard Linden
2013-10-04Pull merge of lindenlab/viewer-releaseMerov Linden
2013-10-03merge changes for 3.6.7-releaseOz Linden
2013-09-11merge changes for vwr-29543Oz Linden
2013-09-09merge with viewer-releaseRichard Linden
2013-08-28merging viewer releaseGilbert Gonzales
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-26merge changes for 3.6.4-releaseOz Linden
2013-08-22merging viewer releaseGilbert Gonzales
2013-08-20merge changes for 3.6.3-releaseOz Linden
2013-08-19MergeXiaohong Bao
2013-08-19merge changes for 3.6.3-releaseOz Linden
2013-08-14merge changes for STORM-1932Oz Linden
2013-10-23Merge latest viewer-release with FBCsimon
2013-08-26Merge downstream code for CHUIStormsimon
2013-08-14MAINT-2897 MAINT-2897 Need to be able to save textures from inventory as PNGdmitrykproductengine
2013-08-12MAINT-2883 FIXED World Map - Land For Sale is missing L$ / sqmmaksymsproductengine
2013-08-02changed facebook_post_success text to be more consistent with other ↵Cho
notification text for ACME-793
2013-07-31ACME-778: Adjusted the facebook code so that isConnected() does not depend ↵Gilbert Gonzales
on state changes. Instead it returns true if the user successfully connected and false if the user successfully disconnected.
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-07-28STORM-1957 World Map - Land For Sale is missing L$ / sqmJonathan Yap
2013-07-23ACME-677 Make the 'Connect...', 'Disconnect' and 'Use another account...' ↵Gilbert Gonzales
buttons disabled upon clicking
2013-07-08ACME-651 : Use localizable strings and simplify the xml for status and error ↵Merov Linden
fields
2013-07-02MAINT-528 added syntax highlighting for STATUS_BLOCK_GRAB_OBJECT and ↵Maestro Linden
corrected related tooltips
2013-07-01ACME-645 : Implement the Facebook FUI button. No code, all xml wizardry...Merov Linden
2013-07-09CHUI-978 FIXED Load data from chat log file in separate thread to prevent ↵Mnikolenko ProductEngine
viewer freeze
2013-06-25ACME-580, ACME-572, ACME-591 : Added a toast notification when posting to ↵Merov Linden
Facebook successfully
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-20merge with releaseRichard Linden
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-06-05merge with viewer-releaseRichard Linden
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