summaryrefslogtreecommitdiff
path: root/indra/llimage/llimage.h
AgeCommit message (Collapse)Author
2012-10-16Pull back viewer-development with latest beta mergessimon@Simon-PC.lindenlab.com
2012-10-16pull back changes from 3.4.1-beta8Oz Linden
2012-10-15MAINT-1721 Fix for crash when clicking "back" button after editing appearance.Dave Parks
Reviewed by VoidPointer
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-07-20MAINT-570 Remove unused memory tracking system LLMemTypeDave Parks
2012-06-12for SH-3073: implement a fast cache system for texture fetchingXiaohong Bao
2012-04-12SH-3080 : Implement the TextureReverseByteRange setting so we can play with ↵Merov Linden
that parameter
2012-04-05SH-3060 : Implement new byte range computation, cleaned up use of ↵Merov Linden
compression rate as well.
2012-04-04SH-3060 : New byte range implementation. Intermediate (not working) state.Merov Linden
2012-04-04SH-3075 : Fix encoding for reversible images and small texturesMerov Linden
2012-04-02SH-3060 : Preliminary implementation of the new byte range computation, ↵Merov Linden
implement setting to turn it on or off
2012-03-15SH-3047 : Add a load_size argument to llimage_libtest and allow partial ↵Merov Linden
image file to be loaded.
2012-03-15SH-3047 : Read the number of levels from the j2c image header instead of ↵Merov Linden
relying on hacked computation based on width / height.
2011-07-15Merge from viewer-developmentXiaohong Bao
2011-05-10add debug mode to track the memory allocation/deallocation.Xiaohong Bao
2011-05-04EXP-664 : Make encoding parameters more resilient to bad entries, add levels ↵Merov Linden
as encoding parameters, update test applet to support this
2011-03-09STORM-987 : Add the --image-stats argument, make argument passing more ↵Merov Linden
consistent, fix typos in comments in llimage header
2011-02-23Merge from viewer-developmentXiaohong Bao
2011-01-20fix for SH-829: Viewer attempting to load precached images in file types ↵Xiaohong Bao
that are not being used.
2011-01-06use the private pool in the texture pipelineXiaohong Bao
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-04-01make LLImageBase::allocateData() thread-safe.Xiaohong Bao
insert debug code for EXT-6567: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170]
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-09-05svn merge -r95288:95907 ↵Andrew Meadows
svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 this is a combined mergeback of the following branches as per QAR-841: maint-server/maint-server-1 (absorbed by maint-server-2) maint-server/maint-server-2 maint-server/maint-server-3 havok4/havok4-8 havok4/havok4-9 yes dataserver-is-deprecated
2008-07-22QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> ReleaseSteven Bennetts
merge Branch_1-20-14-Viewer-merge -> release Includes Branch_1-20-Viewer-2 through 92456
2008-07-18merge support-featurettes-snapshot-merge-2 for QAR-754, includes:James Cook
* featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4) * gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3) * featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771) * snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3) Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry * QAR-590 Merge Lock Request for Support Sprint * QAR-627 Merge snapshot improvements * QAR-686 Merge Lock request for Featurettes
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release (Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
QAR-424
2007-10-10svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3Christian Goetze
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04Result of svn merge -r70873:71086 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 ↵Christian Goetze
svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 20:21:43 +0000