summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/da
AgeCommit message (Collapse)Author
2022-02-28Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/newview/llviewerregion.cpp
2021-12-20Merge branch 'master' into DRTVWR-544-maintMnikolenko Productengine
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-11-05SL-16320 Remove obsolete AvaLine stringsAndrey 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-02-17SL-11867 Show “Unable to buy” message via notificationmaxim_productengine
2020-01-29SL-12594, remove the Basic Shaders checkbox from the guiDave Houlton
2019-05-21Merge viewer-release 6.2.3Graham Linden
2019-05-17SL-11213 No longer embedding the channel in the viewer release note urls. ↵Steven Harrison (steven)
Update base URLs to match new viewer release note URL
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-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-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-01-21MAINT-6050 Translations for the link changeAndreyL ProductEngine
2015-11-13MAINT-5860: remove timestamp from the about box (version id is enough)Oz Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-07-07MAINT-4763 FIXED Remove NoValidTimestamp from viewerMnikolenko ProductEngine
2015-05-08MAINT-4688 FIXED Menu item names were changed.Mnikolenko ProductEngine
2014-11-06MAINT-3067 FIXED Show context menu when right clicking avatar name in the ↵Mnikolenko ProductEngine
list. Bumps, Pushes and Hits moved to Help from Develop menu
2014-05-20MAINT-3950 FIXED can't open lag meterRichard Linden
brought back llfloaterlagmeter from the dead, and ported to lltrace
2014-05-07Merge downstream version 3.7.8 codesimon
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-02-28MAINT-3752: Changed the "Show me in Search result" checkbox captionandreylproductengine
2014-01-02MAINT-3592 (Viewer opening square textures should set the 1:1 size constraint)MaximB ProductEngine
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-11-05further fix of inventory keyboard focus and tab order calculationsRichard Linden
2013-09-09merge with viewer-releaseRichard Linden
2013-10-16fix INTL-126 fix incorrectly translated Boolean values in XUI; remove some ↵eli
obsolete strings
2013-07-02CHOP-959: Report region-local position in Help -> About box.Nat Goodspeed
I've never really understood the usefulness of displaying world-global coordinates in the Help -> About box. It seems to me far more useful to know where you are within the current region. If that proves problematic, we can display both sets of coordinates -- but let's try it this way first.
2013-06-20merge with releaseRichard Linden
2013-06-05merge with viewer-releaseRichard Linden
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-01merge changes for 3.5.0-beta7Oz Linden