summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/pl
AgeCommit message (Collapse)Author
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-03SL-16434 Fix menu localizationAndrey Kleshchev
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2020-11-11Merge branch 'master' into DRTVWR-519Callum Prentice
2020-09-22Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterconversationpreview.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.h # indra/newview/llvoicevivox.cpp
2020-09-22Merge branch 'master' into DRTVWR-519Callum Prentice
2020-09-17Remove references to VFS in the non-English language XML files (already ↵Callum Prentice
removed from English (en) versions)
2020-05-28SL-13239 Add 'Touch' to the various attachment context menusMnikolenko Productengine
2020-05-22SL-13190 Allow Edit Attached Object Position From InventoryMnikolenko Productengine
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/lltexturectrl.cpp # indra/newview/skins/default/xui/de/floater_texture_ctrl.xml # indra/newview/skins/default/xui/es/floater_texture_ctrl.xml # indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/it/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml # indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml # indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2020-02-18SL-12641 Remade 'Pick: Texture' floater to eliminate translation overlapsAndrey Kleshchev
2020-02-17SL-11867 Show “Unable to buy” message via notificationmaxim_productengine
2020-01-29SL-12594, remove the Basic Shaders checkbox from the guiDave Houlton
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2020-01-28Merge branch 'master' of https://bitbucket.org/lindenlab/viewer-private into ↵Brad Payne (Vir Linden)
DRTVWR-481 Merge
2019-12-19SL-209 Removed obsolete localization filesandreykproductengine
2019-11-18SL-10499 - bulk upload behavior adjusted to account for possibly different ↵Brad Payne (Vir Linden)
upload prices for different asset types. Also added a confirmation dialog for bulk upload.
2019-05-08Merge viewer-releaseGraham Linden
2019-02-15SL-10234 Fixed The viewer shows installation language as system defaultandreykproductengine
2018-06-27MAINT-8011 make newly created Sky, Water, etc create a system folder with ↵Graham Linden
proper icon Add entries to strings.xml for all langs for the "settings" string.
2018-05-22MergeRider Linden
2018-02-26MergeRider Linden
2018-02-12Merged in lindenlab/viewer-bearAndreyL ProductEngine
2018-01-18MAINT-8163 Text is corrupted in ToS in non english viewermnikolenkoproductengine
2018-01-17merge 5.1.0-releaseOz Linden
2017-11-10Remove delete preset dialog, Initial settings for selection level ↵Rider Linden
(Region/Parcel/Local)
2017-10-11Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-10-11merge changes for 5.0.8-releaseOz Linden
2017-09-01MAINT-7326 Cache value fix for non-default languagesandreykproductengine
2017-02-27VOICE-46: allow longer connection timeout, with fewer retries. Clarify ports ↵Oz Linden
needed. Remove pointless in-progress notice
2017-02-21First round of changes to replace LLCEFLib with Dullahan. Mostly Windows ↵Callum Prentice
changes in this batch since I'm working on Windows box but some speculative macOS ones too although they are quite untested
2016-11-09MAINT-6918 When viewer language is not set to English, LibVLC version does ↵Mnikolenko Productengine
not display in system information.
2016-05-06merge 4.0.4-release and MAINT-5974Oz Linden
2016-04-18MAINT-6236 clean up unused version values in localized stringsOz Linden
2016-04-07OPEN-292: More removal of orphaned legacy script upload methodsAnsariel
2016-03-07merge DRTVWR-398 build cleanup fixesOz Linden
2016-01-21MAINT-6050 Translations for the link changeAndreyL ProductEngine
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-10-13merge changes for 3.8.5-releaseOz Linden
2015-09-18STORM-2097 reload polish translationsOz Linden
2015-08-11merge changes for 3.8.2-releaseOz Linden
2015-08-04Merge downstream code and become version 3.8.3andreykproductengine
2015-07-15more fixes from code review by AnsarielOz Linden
2015-07-14translation file corrections from EliOz Linden
2015-07-09fix xml validation errorOz Linden
2015-07-07MAINT-4763 FIXED Remove NoValidTimestamp from viewerMnikolenko ProductEngine
2015-05-11FIX INTL-173 Viewer Set43 translation for project viewer-directdeliveryeli
2015-05-08MAINT-4688 FIXED Menu item names were changed.Mnikolenko ProductEngine
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 13:24:56 +0000