summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.cpp
AgeCommit message (Collapse)Author
2022-08-04Merge branch master (DRTVWR-561) into DRTVWR-483Andrey Kleshchev
2022-06-27SL-17640 Fix texture picker not enabling 'apply now'Andrey Kleshchev
2022-06-24SL-17640 Materials Upload UI #1Andrey Kleshchev
1. Allow 'none' textures 2. Disable 'apply now' buttons 3. Switch from loading dae files to just gltf glb
2022-04-15SL-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-01Merge branch 'master' into DRTVWR-486Andrey Lihatskiy
2021-04-01Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-09-28Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/lltexturectrl.h
2020-09-28Merged master(DRTVWR-497) into DRTVWR-486Andrey Kleshchev
2020-09-28Merged master (DRTVWR-497) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-09-23Merge branch 'master' into DRTVWR-486Andrey Lihatskiy
2020-09-23Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-09-22Merged master(DRTVWR-503) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-06-24SL-12688 Warnings part #2Andrey Kleshchev
2020-06-23SL-6109 Removed LLDrawFrustum and used changes from EEP to prevent merge ↵andreykproductengine
conflicts
2020-06-23Backed out changeset: 19f3fa6e3e63andreykproductengine
2020-06-23SL-6109 Implemented LLDrawFrustumandreykproductengine
2020-06-17SL-13359 #5 Implemented revised changesAndrey Kleshchev
2020-05-05BuildfixAndrey Lihatskiy
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-04-21Merge branch 'master' into DRTVWR-483Andrey 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-20Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-02-18SL-12641 Remade 'Pick: Texture' floater to eliminate translation overlapsAndrey Kleshchev
2019-11-27Upstream merge from viewer-nekoAndreyL ProductEngine
2019-11-13Merge in from viewer-release 6.3.5Dave Houlton
2019-11-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-11SL-6109 Removed LLDrawFrustum and used changes from EEP to prevent merge ↵andreykproductengine
conflicts
2019-11-11Backed out changeset: 19f3fa6e3e63andreykproductengine
2019-10-01SL-6109 Implemented LLDrawFrustumandreykproductengine
2019-11-14Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-10-18SL-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-10Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-08-29Merge from lindenlab/viewer-releaseandreykproductengine
2019-08-27Merge fixAnsariel
2019-08-27Move decl of statics inside func to appease Clang, maybe.Graham Linden
2019-08-26Make texture ctrl visibility set respect BOOL vs bool and use better naming.Graham Linden
2019-08-26Fix merged code use of obsoleted vars and other merge errors.Graham Linden
2019-08-26Merge 6.3.1 viewer-releaseGraham Linden
2019-06-25SL-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 pickerAnchor
2019-06-20DRTVWR-493 LLLocalBitmapMgr to Singletonandreykproductengine
2019-05-13Fix merge errorAnsariel
2019-05-10MergeAnchor
2019-05-08Remove unref'd vars for Clang.Graham Linden
2019-05-08Merge viewer-releaseGraham Linden
2019-02-05[SL-1172] - fix selected saved textures not workingAnchor
2019-01-25SL-1945 Day Cycle Editor Copy Trackandreykproductengine
2019-01-04SL-1866 FIXED [OSX] Viewer crashes when the user changes avatar after ↵maxim_productengine
editing texture
2018-12-14SL-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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 09:32:23 +0000