99d76f85f9
MAINT-6729 Additional fix for crash in LLImageGL::analyzeAlpha()
2016-12-08 17:21:05 +02:00
09b9913d35
Merge viewer-vob
2016-08-29 11:40:53 +02:00
cb89140d29
Merge LL release 4.0.7
2016-08-11 23:42:52 +02:00
5e02d304f0
MAINT-6618 More checks
2016-08-09 19:26:30 +03:00
acdb050ce5
MAINT-6584: Convert LLImage class hierarchy to standard 'bool'
...
instead of legacy BOOL.
2016-07-22 11:35:23 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
4042617479
MAINT-4329 Backed out changeset: fd3a4d5c2cf5
2015-02-13 20:05:48 +02:00
1f465086c0
Merge LL V3.7.10
2015-01-11 18:40:22 +01:00
41170b5603
MAINT-4329 FIXED scales each image *twice* for no apparent reason : patchset #2
2014-09-25 21:19:17 +03:00
8dae4bc222
Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors
2014-05-06 18:21:04 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
6bf3cb875c
ACME-1195 : WIP : Lazy evaluate intermediate images in snapshot preview so perf is better in common cases, allow thumbnail to be computed from grabed frame (for SL Share), thumbnail display still buggy in SL Share
2014-01-28 10:19:57 -08:00
4b2e69d8e0
ACME-1236 : Clean up llimage after refactoring so there's no difference with viewer-release
2014-01-15 10:27:49 -08:00
7cc64a09a3
ACME-1236 : Refactor filters and vignette into llimagefilter, add example filters to llimage_libtest
2014-01-14 21:01:51 -08:00
0c7cab771c
ACME-1236 : Add lines as a new type of vignette and Brightscan as an example
2014-01-09 21:58:30 -08:00
3161d822ab
ACME-1236 : WIP : Added mode and angle parameter to filterScreen (renamed for consistency)
2014-01-08 15:41:42 -08:00
c2a974f155
ACME-1236 : WIP : Introduced screenFilter, simple creative screening filter
2014-01-07 22:10:23 -08:00
3cbd0dfd84
ACME-1236 : WIP : Make each color correct filter use a per channel alpha argument, tweak Instagram-like test filters for discussion
2014-01-06 14:46:52 -08:00
90cbda6db0
ACME-1236 : WIP : Add 2 new color correction filters. Add a la Instagram composite filters for testing in llimage_libtest
2014-01-03 17:31:04 -08:00
35e30759c8
ACME-1236 : WIP : Added a min value to vignette
2014-01-03 15:44:29 -08:00
1b5fb66292
ACME-1236 : WIP : Added the vignette mode. Can be applied to colorCorrect and color Transform. Added new -v argument to llimage_libtest
2014-01-03 14:19:29 -08:00
d28b92744e
ACME-1236 : WIP : added all the color correction filters: colorize, linarize, equalize, contrast, brightness
2014-01-02 16:14:38 -08:00
205a4e3dc6
ACME-1236 : WIP : add filterGamma, computeHistograms, colorCorrect, implemented filter gamma to llimage_libtest for testing
2014-01-01 19:42:10 -08:00
9dca514c0b
ACME-1236 : WIP : add filterRotate to rotate hue, add rotate as a valid argument to --filter in llimage_libtest
2014-01-01 17:58:52 -08:00
08a798bb1d
ACME-1236 : WIP : Implement saturation/desaturation transform filter, add it to llimage_libtest for testing
2013-12-30 20:33:33 -08:00
7372afaae4
ACME-1236 : WIP : Implement colorTransform filter, grayscale and sepia using it, add parameter to llimage_libtest to use filters
2013-12-20 13:49:20 -08:00
6578144b7e
ACME-1236 : WIP : Added Gray Scale as an experimental filter in Flickr. Lots of ugly hacks for now
2013-12-18 15:55:13 -08:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
075a7bcc98
SH-4297 WIP interesting: viewer-interesting starts loading cached scene late
...
dependency cleanup - removed a lot of unecessary includes
2013-07-18 15:09:45 -07:00
8208a40412
BUILDFIX: reverted changes that attempted to automate mem track
...
stat definition as they don't work on gcc/clang
2013-07-01 18:50:51 -07:00
04bdc8ba83
SH-4294 FIX Interesting: Statistics Texture cache hit rate is always 0%
...
also, removed LLTrace::init and cleanup
removed derived class implementation of memory stat for LLMemTrackable
is automatic now
2013-07-01 17:04:01 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
c7f7c4bc4d
Merge viewer-beta
2013-05-09 13:14:49 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
066f2acadf
Forgot to commit @#! merge
2013-04-11 16:23:36 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
f07b9c2c69
renamed LLTrace stat gathering classes/methods to make the structure of LLTrace clearer
...
Count becomes CountStatHandle
Count.sum becomes sum(Count, value), etc.
2013-03-06 11:08:25 -08:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
831e4f443b
Merge LL 3.6.3 pass 1
2013-08-26 17:09:27 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
e8bb9d4601
Backout eefd363ebae7 (Crashhunting in LLImageRaw) the assertion got hit and thus the theory that the image gets garbled correct.
2013-04-24 23:43:29 +02:00
38ac71c62b
Hunting a weird crash. Seems like LLImageRaw can be changed by another thread while one thread tries to read the data. Added a few assertions to test this theory.
2013-04-23 23:58:52 +02:00
cbff0e7ab8
SH-3468 WIP add memory tracking base class
...
attempted fix for gcc compile errors
can't use typeid() on a class that doesn't have a method
defined in a translation unit
fix is to force classes deriving from LLMemTrackable to
use their own static member named sMemStat
2013-01-04 13:48:35 -08:00
d3b9f446a6
fix for MAINT-2147: crash in LLTextureCache::writeToFastCache on OSX
2013-01-03 22:37:44 -07:00
802e738b77
Fix for alpha blending using gl fixed-functions not matching shader implementation
2012-12-18 23:40:31 +00:00
1f56e57008
SH-3468 WIP add memory tracking base class
...
created memory tracking trace type
instrumented a few classes with memory tracking
2012-12-18 00:58:26 -08:00
c0224cc47a
merge with viewer-development
2012-11-19 19:06:36 -08:00
7f0d6e0377
Pull back viewer-development with latest beta merges
2012-10-16 09:58:31 -07:00
e7a5dc7cda
pull back changes from 3.4.1-beta8
2012-10-16 09:36:15 -04:00
c97730988e
MAINT-1721 Fix for crash when clicking "back" button after editing appearance.
...
Reviewed by VoidPointer
2012-10-15 15:59:41 -05:00
371b66a6ef
Automated merge with http://bitbucket.org/lindenlab/viewer-development
2012-09-06 11:47:48 -07:00
38acb45af8
Merge in latest viewer-development
2012-09-05 17:17:54 -07:00
6425b3cd65
Merge RLVa SSB update
2013-02-24 18:24:48 -08:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
ceea332a9c
Change old style comments <ND> to <FS:ND> to avoid any future confusion/
2012-12-16 05:19:32 +01:00
5b5f4c8bf5
Merge LL 3.4.2 release,
...
broken revision, KDU package needs updating, mac packager also likely broken
2012-12-14 07:59:55 -08:00
eaa3a51a19
Texture comment metadata support.
...
Currently extracts the comment out of the texture if it exists and decodes any <letter>=<value> embedded in the comment.
Currenly LL uses this to id the uploader and time uploaded.
This will be used by the export feature in the future.
2012-11-21 23:36:37 -05:00
93d4b47252
Merge LL 3.4.1 beta 10
2012-10-26 09:59:19 -07:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
0d80aced24
for SH-3073: implement a fast cache system for texture fetching
2012-06-12 17:01:48 -06:00
c410a4e332
SH-3080 : Implement the TextureReverseByteRange setting so we can play with that parameter
2012-04-12 20:19:56 -07:00
91094d92a7
SH-3060 : Implement new byte range computation, cleaned up use of compression rate as well.
2012-04-05 22:05:00 -07:00
782981866a
SH-3060 : New byte range implementation. Intermediate (not working) state.
2012-04-04 18:58:34 -07:00
c6511d9c85
SH-3075 : Fix encoding for reversible images and small textures
2012-04-04 15:59:52 -07:00
df09fd8e8b
SH-3060 : Preliminary implementation of the new byte range computation, implement setting to turn it on or off
2012-04-02 19:05:32 -07:00
fe7a4d0183
SH-3047 : Add a load_size argument to llimage_libtest and allow partial image file to be loaded.
2012-03-15 14:07:54 -07:00
bc6f669ff4
SH-3047 : Read the number of levels from the j2c image header instead of relying on hacked computation based on width / height.
2012-03-15 13:01:14 -07:00
991d43709c
merge LL 3.3.3 beta
2012-06-16 07:22:27 -07:00
d951267467
Merge from viewer-development
2011-07-15 12:14:34 -06:00
b594d3b04d
add debug mode to track the memory allocation/deallocation.
2011-05-10 21:02:20 -06:00
c6c1419faa
EXP-664 : Make encoding parameters more resilient to bad entries, add levels as encoding parameters, update test applet to support this
2011-05-04 22:43:51 -07:00
7f42c02cad
STORM-987 : Add the --image-stats argument, make argument passing more consistent, fix typos in comments in llimage header
2011-03-09 20:54:59 -08:00
01cdeb0cdd
Merge from viewer-development
2011-02-23 10:44:59 -07:00
e3f5b66d5a
fix for SH-829: Viewer attempting to load precached images in file types that are not being used.
2011-01-20 15:20:27 -07:00
611d8bdf61
use the private pool in the texture pipeline
2011-01-06 16:20:21 -07:00
349eabb635
Print if/how many textures had been discarded due to low memory. That gives at least a clue why things might begin to look weird with missing textures.
2011-12-17 01:40:46 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
990011f3d6
make LLImageBase::allocateData() thread-safe.
...
insert debug code for EXT-6567: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170]
2010-04-01 10:30:27 -06:00
35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
222bca24c1
svn merge -r95288:95907 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-09-05 22:03:35 +00:00
0c0391cc71
QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release
...
merge Branch_1-20-14-Viewer-merge -> release
Includes Branch_1-20-Viewer-2 through 92456
2008-07-22 19:01:52 +00:00
ed386ae547
merge support-featurettes-snapshot-merge-2 for QAR-754, includes:
...
* 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-07-18 17:50:25 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
b5936a4b1d
1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
...
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-03 19:21:14 +00:00
941cb9f412
merge release@83343 skinning-1-merge@83714 -> release
...
QAR-424
2008-04-01 17:45:04 +00:00
5ec8bbbe22
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
2007-10-10 00:01:43 +00:00
5595a99623
Result of svn merge -r71162:71205 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-04 23:19:43 +00:00
4942a7b779
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
2007-10-04 16:31:48 +00:00
ce0a5fe145
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
...
Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-21 22:17:53 +00:00
e03bb0606a
merge -r62831:64079 branches/maintenance to release
2007-06-21 22:40:22 +00:00
4dabd9c047
merge release@58699 beta-1-14-0@58707 -> release
2007-03-02 21:25:50 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
AndreyL ProductEngine