summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.cpp
AgeCommit message (Collapse)Author
2020-09-28Merged master (DRTVWR-497) into DRTVWR-514-keymappingsAndrey Kleshchev
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-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-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-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-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-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-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.
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-27MergeAnchor Linden
2018-05-23MAINT-8619 Disable local textures for selection in Group profilemaxim_productengine
2018-05-21[DRTVWR-455] - added 5 new bake channelsAnchor Linden
2018-03-29MAINT-8438: Setting attachment bake texture to None does not refresh the ↵Anchor Linden
base avatar bake.
2018-03-29MAINT-8438: Setting attachment bake texture to None does not refresh the ↵Anchor Linden
base avatar bake
2018-03-28MAINT-8438,8446: fix bakes on child primsAnchor Linden
2018-03-21fixed MAINT-8413,8409,8408Anchor Linden
2018-03-02[MAINT 8081] - show/hide avatar base mesh regions if avatar joint ↵Anchor Linden
attachments are using server bakes. pass the magic ids correctly across ui and texture entry.
2018-02-28[MAINT-8081] - bakes on mesh. 1st pass. changed texture panel to select ↵Anchor Linden
bakes on objects. handle magic bake ids in LLViewerObject.
2016-11-25MAINT-6961 FIXED Some textures(copied from Library) couldn't be set as ↵Mnikolenko Productengine
Outfit image via "Select image" although drag and drop works fine
2016-11-21Merged in Ansariel/storm-2141AndreyL ProductEngine
2016-11-14STORM-2141: Fix various inventory floater related issues:Ansariel
* Opening new inventory via Control-Shift-I shortcut uses legacy and potentinally dangerous code path * Closing new inventory windows don't release memory * During shutdown legacy and inoperable code for inventory window cleanup is called * Remove old and unused inventory legacy code
2016-09-15Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2016-08-23MAINT-6616 new crash in VOB viewer in snapshot previewMnikolenko Productengine
2016-08-17MAINT-6655 Group inspector doesn't support default icon.andreykproductengine
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 11:59:36 +0000