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
Oz Linden