Age | Commit message (Collapse) | Author | |
---|---|---|---|
2023-10-03 | SL-20347 Fix structure of localized panel_main_inventory | Andrey Kleshchev | |
2023-08-23 | Merge branch main (DRTVWR-582) into DRTVWR-567 | Andrey Kleshchev | |
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorymodel.cpp # indra/newview/llinventoryobserver.cpp # indra/newview/llinventoryobserver.h # indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml | |||
2023-05-17 | Merge branch 'main' into DRTVWR-567 | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt | |||
2023-04-07 | Merge branch 'main' into marchcat/main-contrib-merge | Andrey Lihatskiy | |
# Conflicts: # indra/cmake/CMakeLists.txt # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/llcommon/tests/llleap_test.cpp # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm # indra/newview/skins/default/xui/en/strings.xml | |||
2023-03-30 | Merge branch 'main' into DRTVWR-567 | Maxim Nikolenko | |
# Conflicts: # indra/newview/llinventoryfunctions.cpp # indra/newview/llpanelmaininventory.h # indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/en/sidepanel_item_info.xml | |||
2023-03-30 | Merge branch 'main' into DRTVWR-577-maint-S | Andrey Lihatskiy | |
# Conflicts: # indra/cmake/CMakeLists.txt # indra/newview/skins/default/xui/es/floater_tools.xml | |||
2023-03-23 | SL-19391 FIXED SFV floater title displays unlocalised name for system folders | Maxim Nikolenko | |
2023-02-13 | SL-19207 Polish translation: notifications, strings, a few floaters; Minor ↵ | Pantera Północy | |
changes in /en/ (#78) | |||
2023-02-08 | SL-19134 Remove llfloaterproperties | Andrey Kleshchev | |
Looks like it wasn't used for a while and LLFloaterItemPropertie does the same thing now | |||
2023-01-16 | SL-18937 Add missing panel_* files in Polish translation (#50) | Pantera Północy | |
2023-01-07 | Translate missing control_*, floater_* menu_* and few panel_* files in ↵ | PanteraPolnocy | |
Polish directory; Fix localizability in various English XMLs | |||
2023-01-04 | SL-18904 Remove unused translation files | Andrey Kleshchev | |
2023-01-03 | Polish translation: Leftovers cleanup (files not present in /en/) | PanteraPolnocy | |
2023-01-03 | Widgets cleanup in Polish translation (up to 6.6.9), fix translatability for ↵ | PanteraPolnocy | |
density_ctrl.xml file | |||
2022-10-27 | SL-18172 add the link to open object weights floater | Mnikolenko Productengine | |
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-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 | 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-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-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-03-18 | Merge master (v 6.3.9) into DRTVWR-440 | Dave Houlton | |
2020-03-18 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
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 | |