Age | Commit message (Collapse) | Author | |
---|---|---|---|
2022-08-31 | Merge branch 'master' into DRTVWR-544-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelprofile.cpp | |||
2022-07-20 | SL-17798 floater now allows 1024 textures | Andrey Kleshchev | |
2022-06-29 | Merge branch 'master' into DRTVWR-544-maint | Andrey Lihatskiy | |
2022-06-29 | Merge branch 'master' (DRTVWR-543) into DRTVWR-483 | Andrey Kleshchev | |
# Conflicts: # indra/newview/llviewertexturelist.cpp | |||
2022-05-31 | Merge branch 'master' into DRTVWR-544-maint | Andrey Lihatskiy | |
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h | |||
2022-05-27 | Merge branch 'master' into DRTVWR-543-maint | Andrey Lihatskiy | |
# Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp | |||
2022-05-26 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llviewertexturelist.cpp | |||
2022-03-01 | Merge branch 'master' (DRTVWR-557) into DRTVWR-546 | Andrey Kleshchev | |
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py | |||
2022-02-28 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llviewermenu.cpp | |||
2022-02-28 | Merge branch 'master' into DRTVWR-544-maint | Andrey Lihatskiy | |
# Conflicts: # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/newview/llviewerregion.cpp | |||
2022-02-28 | Merge branch 'master' into DRTVWR-543-maint | Andrey Lihatskiy | |
2021-12-26 | Merge branch 'master' into DRTVWR-543-maint | Andrey Lihatskiy | |
2021-12-26 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
2021-12-20 | Merge branch 'master' into DRTVWR-544-maint | Mnikolenko Productengine | |
2021-12-15 | DRTVWR-546 merge up to 6.5.2 | Dave Houlton | |
2021-12-15 | Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint | Andrey Kleshchev | |
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount | |||
2021-12-03 | SL-16434 Fix menu localization | Andrey Kleshchev | |
2021-11-29 | DRTVWR-542 merge, purge GLOD copyrights from xml | Dave Houlton | |
2021-11-05 | SL-16320 Remove obsolete AvaLine strings | Andrey Kleshchev | |
2021-07-19 | SL-15592 Emergency login failure dialog | Andrey Kleshchev | |
Server message by id "LoginFailure" was pulling in header instead of a message | |||
2021-03-09 | This 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-09 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
2021-03-08 | Revert "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. | |||
2021-03-02 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
2020-11-11 | Merge branch 'master' into DRTVWR-519 | Callum Prentice | |
2020-11-11 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt # indra/newview/llpanelavatar.cpp | |||
2020-09-23 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
2020-09-22 | Merge branch 'master' into DRTVWR-507-maint | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterconversationpreview.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.h # indra/newview/llvoicevivox.cpp | |||
2020-09-22 | Merge branch 'master' into DRTVWR-519 | Callum Prentice | |
2020-09-17 | Remove references to VFS in the non-English language XML files (already ↵ | Callum Prentice | |
removed from English (en) versions) | |||
2020-05-28 | SL-13239 Add 'Touch' to the various attachment context menus | Mnikolenko Productengine | |
2020-05-22 | SL-13190 Allow Edit Attached Object Position From Inventory | Mnikolenko Productengine | |
2020-05-19 | SL-13270 Pull translations into the corresponding xml files. | Mnikolenko Productengine | |
2020-05-05 | Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint | Andrey 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-04-21 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/llviewerfloaterreg.cpp # indra/newview/skins/default/xui/de/floater_preview_texture.xml # indra/newview/skins/default/xui/es/floater_preview_texture.xml # indra/newview/skins/default/xui/fr/floater_preview_texture.xml # indra/newview/skins/default/xui/it/floater_preview_texture.xml # indra/newview/skins/default/xui/ja/panel_edit_classified.xml # indra/newview/skins/default/xui/ja/panel_me.xml # indra/newview/skins/default/xui/ru/floater_preview_texture.xml # indra/newview/skins/default/xui/tr/floater_picks.xml # indra/newview/skins/default/xui/tr/floater_preview_texture.xml # indra/newview/skins/default/xui/tr/panel_edit_classified.xml # indra/newview/skins/default/xui/tr/panel_me.xml # indra/newview/skins/default/xui/zh/floater_preview_texture.xml | |||
2020-02-18 | SL-12641 Remade 'Pick: Texture' floater to eliminate translation overlaps | Andrey Kleshchev | |
2020-02-17 | SL-11867 Show “Unable to buy” message via notification | maxim_productengine | |
2020-02-05 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
2020-01-29 | SL-12594, remove the Basic Shaders checkbox from the gui | Dave Houlton | |
2020-01-28 | DRTVWR-440, merge in latest from 6.3.7 release | Dave Houlton | |
2019-12-19 | SL-209 Removed obsolete localization files | andreykproductengine | |
2019-10-23 | Merged in lindenlab/viewer-release | AndreyL ProductEngine | |
2019-10-16 | merge | Brad Payne (Vir Linden) | |
2019-09-18 | SL-11921 FIXED Some translations overlap the 'About Land' and 'Preferences' UI | maxim_productengine | |
2019-09-09 | FIX INTL-367 Translation update for Set59 (EEP Viewer, DRTVWR-440) | eli | |
2019-07-18 | FIX INTL-355 translation of Set58 for 9 languages, for project repo ↵ | eli | |
483-legacy_profiles | |||
2019-05-26 | FIX INTL-351 translation update for 9 languages for viewer-lynx | eli | |
2019-05-08 | Merged in lindenlab/viewer-release | AndreyL ProductEngine | |
2019-05-08 | Merge viewer-release | Graham Linden | |
2019-04-17 | Merge 6.2.1 | Graham Linden | |