summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimagepreview.cpp
AgeCommit message (Collapse)Author
2024-09-04Fixed missing comma in list. Fixed loop with too small loop variable. (#2497)TJ
2024-07-08Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h ↵Ansariel
and llunittype.h for now
2024-05-23Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵Brad Linden
brad/merge-maint-a-to-dev
2024-05-22Fix line endlingsAnsariel
2024-05-22Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-AAnsariel
# Conflicts: # autobuild.xml # indra/cmake/CMakeLists.txt # indra/cmake/GoogleMock.cmake # indra/llaudio/llaudioengine_fmodstudio.cpp # indra/llaudio/llaudioengine_fmodstudio.h # indra/llaudio/lllistener_fmodstudio.cpp # indra/llaudio/lllistener_fmodstudio.h # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/llaudio/llstreamingaudio_fmodstudio.h # indra/llcharacter/llmultigesture.cpp # indra/llcharacter/llmultigesture.h # indra/llimage/llimage.cpp # indra/llimage/llimagepng.cpp # indra/llimage/llimageworker.cpp # indra/llimage/tests/llimageworker_test.cpp # indra/llmessage/tests/llmockhttpclient.h # indra/llprimitive/llgltfmaterial.h # indra/llrender/llfontfreetype.cpp # indra/llui/llcombobox.cpp # indra/llui/llfolderview.cpp # indra/llui/llfolderviewmodel.h # indra/llui/lllineeditor.cpp # indra/llui/lllineeditor.h # indra/llui/lltextbase.cpp # indra/llui/lltextbase.h # indra/llui/lltexteditor.cpp # indra/llui/lltextvalidate.cpp # indra/llui/lltextvalidate.h # indra/llui/lluictrl.h # indra/llui/llview.cpp # indra/llwindow/llwindowmacosx.cpp # indra/newview/app_settings/settings.xml # indra/newview/llappearancemgr.cpp # indra/newview/llappearancemgr.h # indra/newview/llavatarpropertiesprocessor.cpp # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llbreadcrumbview.cpp # indra/newview/llbreadcrumbview.h # indra/newview/llbreastmotion.cpp # indra/newview/llbreastmotion.h # indra/newview/llconversationmodel.h # indra/newview/lldensityctrl.cpp # indra/newview/lldensityctrl.h # indra/newview/llface.inl # indra/newview/llfloatereditsky.cpp # indra/newview/llfloatereditwater.cpp # indra/newview/llfloateremojipicker.h # indra/newview/llfloaterimsessiontab.cpp # indra/newview/llfloaterprofiletexture.cpp # indra/newview/llfloaterprofiletexture.h # indra/newview/llgesturemgr.cpp # indra/newview/llgesturemgr.h # indra/newview/llimpanel.cpp # indra/newview/llimpanel.h # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryclipboard.cpp # indra/newview/llinventoryclipboard.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorygallery.cpp # indra/newview/lllistbrowser.cpp # indra/newview/lllistbrowser.h # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llpanelprofile.h # indra/newview/llpreviewgesture.cpp # indra/newview/llsavedsettingsglue.cpp # indra/newview/llsavedsettingsglue.h # indra/newview/lltooldraganddrop.cpp # indra/newview/llurllineeditorctrl.cpp # indra/newview/llvectorperfoptions.cpp # indra/newview/llvectorperfoptions.h # indra/newview/llviewerparceloverlay.cpp # indra/newview/llviewertexlayer.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/macmain.h # indra/test/test.cpp
2024-05-06Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵RunitaiLinden
gltf-dev-maint-a-merge
2024-05-01Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-mergeAndrey Lihatskiy
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-04-12viewer#1081 LLFloaterImagePreview 2048 image upload supportAndrey Kleshchev
2024-04-12viewer#1081 2K texture apload price arrives as an array #2Andrey Kleshchev
2024-04-12viewer-private#226 Unhandled PngError throws application into a loopAndrey Kleshchev
png_read_info triggered a PngError, LLAppViewer::frame() handled it instead of LLPngWrapper::readPng, and since status didn't change viewer tried to decode image again and again and again.
2024-04-01viewer#1081 Account for 2K texture upload price in bulk uploadAndrey Kleshchev
2024-04-01viewer#1081 Account for 2K texture upload price in material and texture uploadAndrey Kleshchev
2024-02-22viewer#855 Xcode buildfixAndrey Lihatskiy
2024-02-21Convert remaining BOOL to boolAnsariel
2024-02-21Convert BOOL to bool in lluiAnsariel
2024-02-18Replace BOOL with bool in llwindow and dependent classesAnsariel
2023-12-21SL-20743 Use LLMutex in LLImageBase for internal data thread-safetyAlexander Gavriliuk
2023-05-16DRTVWR-559 Decruft deprecated OpenGL flags.RunitaiLinden
2023-01-25SL-19081: Fix assert when uploading textureCosmic Linden
2023-01-19Optimizations, decruft, and intel compatibility pass (#53)RunitaiLinden
SL-18869, SL-18772 Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
2021-11-30SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunctionDave Houlton
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-03-18SL-12870 Misleading UI valueAndrey Kleshchev
2019-11-25SL-12097, SL-12098, SL-12099 UI update for Texture, Animation and Sound ↵Mnikolenko Productengine
upload fees
2019-08-10DRTVWR-493 LLUI to LLParamSingletonandreykproductengine
2018-05-18mergeBrad Payne (Vir Linden)
2018-02-07MAINT-8258 Don't show sculpty until it is loaded or load failsandreykproductengine
2017-12-04SL-704 - made avatar hierarchy more consistent by adding lluiavatar for ↵Brad Payne (Vir Linden)
viewer-local avs used in upload previews
2017-11-01MAINT-7228 Vertex buffer allocation failure handlingandreykproductengine
2015-11-10remove execute permission from many files that should not have itOz Linden
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2012-10-16MAINT-643 Fix for incorrect lighting and colors in preview displays.Dave Parks
2012-09-09Fixed crashes on login. Moved most of the remaining character/skeleton ↵Don Kjer
generation code into llappearance. Moved non-rendering related LLViewerJoint functionality into LLAvatarJoint.
2012-09-07SH-3264 Porting over the XML loading of the avatar structure to llappearanceNyx (Neal Orman)
Moved over the necessary classes to llappearance to support the loading of the avatar's structure & params from file.
2012-05-07MAINT-753 : [crashhunters] crash at LLVOVolume::updateFaceFlags(). Null ↵simon@Simon-PC.lindenlab.com
pointer checks are good. Reviewed by Kelly
2012-01-11EXP-1511 REFIX Preview image overlays ui elements in Upload image floatercallum
Tweaked offset and missed a corner case
2012-01-09EXP-1511 FIX Preview image overlays ui elements in Upload image floatercallum
2011-09-14SH-2243 work in progress -- application side matrix stack managementDave Parks
2011-08-11SH-2242 FXAA support instead of unreliable multisample textures (done here ↵Dave Parks
because it's a smaller change than integrating glVertexAttrib with FSAA pipe). Shader integration with LLDynamicTexture subclasses.
2011-08-08SH-2242 Work in progress migrating to glVertexAttrib everywhereDave Parks
2011-05-02mergeDave Parks
2011-04-13EXP-669 : Refactor code to use correct LLImageFormatted methods to load ↵Merov Linden
images of all formats, reviewed by richard
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-31mergeDave Parks
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 21:03:37 +0000