Age | Commit message (Collapse) | Author | |
---|---|---|---|
2022-08-04 | Merge branch master (DRTVWR-561) into DRTVWR-483 | Andrey Kleshchev | |
2022-04-15 | SL-17204 FIXED The texture with full permissions is settled on the prim ↵ | Mnikolenko Productengine | |
after copying texture from the object with texture with no transfer permission | |||
2021-04-01 | Merge branch 'master' into DRTVWR-486 | Andrey Lihatskiy | |
2021-04-01 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
2020-09-28 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
# Conflicts: # indra/newview/lltexturectrl.h | |||
2020-09-28 | Merged master(DRTVWR-497) into DRTVWR-486 | Andrey Kleshchev | |
2020-09-28 | Merged master (DRTVWR-497) into DRTVWR-514-keymappings | Andrey Kleshchev | |
2020-09-23 | Merge branch 'master' into DRTVWR-486 | Andrey Lihatskiy | |
2020-09-23 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
2020-09-22 | Merge branch 'master' v6.4.9 into DRTVWR-497 | Dave Houlton | |
2020-09-22 | Merged master(DRTVWR-503) into DRTVWR-514-keymappings | Andrey Kleshchev | |
2020-06-24 | SL-12688 Warnings part #2 | Andrey Kleshchev | |
2020-06-23 | SL-6109 Removed LLDrawFrustum and used changes from EEP to prevent merge ↵ | andreykproductengine | |
conflicts | |||
2020-06-23 | Backed out changeset: 19f3fa6e3e63 | andreykproductengine | |
2020-06-23 | SL-6109 Implemented LLDrawFrustum | andreykproductengine | |
2020-06-17 | SL-13359 #5 Implemented revised changes | Andrey Kleshchev | |
2020-05-05 | Buildfix | Andrey Lihatskiy | |
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-04-20 | Merge branch 'master' into DRTVWR-497 | Andrey Lihatskiy | |
2020-02-18 | SL-12641 Remade 'Pick: Texture' floater to eliminate translation overlaps | Andrey Kleshchev | |
2019-11-27 | Upstream merge from viewer-neko | AndreyL ProductEngine | |
2019-11-13 | Merge in from viewer-release 6.3.5 | Dave Houlton | |
2019-11-13 | Merged in lindenlab/viewer-release | AndreyL ProductEngine | |
2019-11-11 | SL-6109 Removed LLDrawFrustum and used changes from EEP to prevent merge ↵ | andreykproductengine | |
conflicts | |||
2019-11-11 | Backed out changeset: 19f3fa6e3e63 | andreykproductengine | |
2019-10-01 | SL-6109 Implemented LLDrawFrustum | andreykproductengine | |
2019-11-14 | Merged in lindenlab/viewer-release | AndreyL ProductEngine | |
2019-10-18 | SL-11840 [Bakes on Mesh] Enable bake textures to be applied to non-attached ↵ | ruslantproductengine | |
editable items - Now bake texture channel's available for assign for non attached objects | |||
2019-09-10 | Merged in lindenlab/viewer-release | AndreyL ProductEngine | |
2019-08-29 | Merge from lindenlab/viewer-release | andreykproductengine | |
2019-08-27 | Merge fix | Ansariel | |
2019-08-27 | Move decl of statics inside func to appease Clang, maybe. | Graham Linden | |
2019-08-26 | Make texture ctrl visibility set respect BOOL vs bool and use better naming. | Graham Linden | |
2019-08-26 | Fix merged code use of obsoleted vars and other merge errors. | Graham Linden | |
2019-08-26 | Merge 6.3.1 viewer-release | Graham Linden | |
2019-06-25 | SL-11431 [Legacy Profiles] Clicking someone else's profile picture should ↵ | maxim_productengine | |
open image modal. | |||
2019-06-23 | [SL-11433] - fix dirty flag in texture picker | Anchor | |
2019-06-20 | DRTVWR-493 LLLocalBitmapMgr to Singleton | andreykproductengine | |
2019-05-13 | Fix merge error | Ansariel | |
2019-05-10 | Merge | Anchor | |
2019-05-08 | Remove unref'd vars for Clang. | Graham Linden | |
2019-05-08 | Merge viewer-release | Graham Linden | |
2019-02-05 | [SL-1172] - fix selected saved textures not working | Anchor | |
2019-01-25 | SL-1945 Day Cycle Editor Copy Track | andreykproductengine | |
2019-01-04 | SL-1866 FIXED [OSX] Viewer crashes when the user changes avatar after ↵ | maxim_productengine | |
editing texture | |||
2018-12-14 | SL-10233 FIXED 'Default' button doesn't work in 'Pick:Texture' floater for ↵ | maxim_productengine | |
multiple selections with different textures | |||
2018-07-15 | [MAINT-8846] - fixing duplicate id in avatar_lad.xml fixrs character test ↵ | Anchor Linden | |
female crash. code cleanup. | |||
2018-06-28 | [MAINT 8434] - fix mode select doesnt change on drag n drop, | Anchor Linden | |
[MAINT 8410] - fix eye dropper still active after switching to bake mode, [MAINT 8464] - fix bake mode active for non attached objects | |||
2018-06-27 | Merge | Anchor Linden | |