2662c4b679
Merge. Pulling fix for VWR-25862 into bigger cache tree.
2011-06-01 17:05:38 -04:00
57bdcd6bda
VWR-25862 Potential fix for caches not clearing when they are supposed to.
...
* Removed leading delimiter from filename mask in all calls to
LLDir::deleteFilesInDir() that are related to the viewer asset caches
(texture, VFS, and VO).
2011-05-25 15:44:03 -04:00
5c7a906b44
Increased the viewer cache size limit to 10GB. Increased the default to 1GB.
...
* Changed the hard coded cache limit in llappviewer.cpp to 10GB as well as the
slider maximum in the preferences menu. * The VFS cache is capped at 1GB due
to file system limitations. The former 80/20 split between texture/vfs is
maintained up to 5GB. Above this limit the texture cache is given all
the additional cache space up to 10GB.
* Fixed a log message in lltexturecache.cpp that was not showing the correct
texture size. ER-883
* Fixed a bug in llfloaterpreference.cpp that caused new cache value to be
written to the old cache setting. This resulted in the the cache not being
cleared when the location was set back to the default. ER-882
* Disabled the "The cache will be cleared on reboot" message that is triggered
by the reset button in the cache preferences in the case where the cache
is already located in the default location. The cache is only cleared when
its location is changed. This is intended to address resident confusion
regarding the purpose of the reset button, as demonstrated in VWR-19562.
2011-05-06 15:15:17 -04:00
005da00fff
STORM-1059 : Fix for cache purging (fix by Aleric)
2011-03-11 14:38:09 -08:00
eec332cfbe
Automated merge with http://hg.secondlife.com/viewer-development
2011-01-24 15:51:33 -07:00
295536ae98
VWR-24321: fix validation of textures that start with 00
2011-01-24 09:35:41 -05:00
4af7e9eb64
Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: Viewer attempting to load precached images in file types that are not being used.)
2011-01-21 16:25:23 -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
e9c6800e23
VWR-24317: remove warnings for deleting non-existant texture file on startup
2011-01-20 14:57:33 -05:00
e29f811d56
code for DEV-52939: viewer's object geometry cache files are not limited in number, and can also be incorrectly cleared with the VFS cache.
...
reviewed by andrew.
2010-09-01 13:40:10 -06:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
4682264ead
EXT-8447: FIXED: crash at LLTextureCache::writeEntryToHeaderImmediately(int,LLTextureCache::Entry &,bool) [secondlife-bin lltexturecache.cpp]
2010-08-06 09:29:33 -06:00
d5655c9bbf
EXT-8283 FIX - allow saveWearable to change name of wearable, split off logic for saveAs case. Some remaining UI issues will be filed separately. Reviewed by Nyx
2010-07-15 13:56:46 -04:00
6eb0d854b8
EXT-7294: FIXED: crash at LLTextureCache::updateEntry [secondlife-bin lltexturecache.cpp:1231]
...
Also simply the writing flow of the texture cache.
2010-05-10 16:21:15 -06:00
d6996c7d3d
fix merge poopage.
2010-04-12 11:32:31 +01:00
9fbe736774
(slightly hairy) merge from viewer-hotfix
2010-04-12 11:03:16 +01:00
03b0c60ff5
fix for all wierd crashes happening to lltexturecache.cpp, cuased by running viewer 2.0 and viewer 1.23 at the same time. Specifically for the following jiras:
...
EXT-6692: crash at LLTextureCache::readEntryFromHeaderImmediately [secondlife-bin lltexturecache.cpp:1145]
EXT-6691: crash at LLTextureCache::writeEntryToHeaderImmediately [secondlife-bin lltexturecache.cpp:1126]
possible fix for EXT-6567: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170]
2010-04-07 11:51:41 -06:00
309d94452b
fix for EXT-6678: crash at LLTextureCache::openAndReadEntry [secondlife-bin lltexturecache.cpp:1111]
2010-04-01 11:39:01 -06:00
8b40230f41
fix for EXT-6435: crash at writeEntriesAndClose: ASSERT (num_entries == mHeaderEntriesInfo.mEntries)
2010-03-29 11:32:47 -06:00
970b7051ac
fix for EXT-6566: crash at LLTextureCache::updatedHeaderEntriesFile [secondlife-bin lltexturecache.cpp:1292]
2010-03-29 11:28:42 -06:00
7de49ce1d1
fix for EXT-6435: crash at writeEntriesAndClose: ASSERT (num_entries == mHeaderEntriesInfo.mEntries)
2010-03-29 11:32:47 -06:00
a0022e65ec
fix for EXT-6566: crash at LLTextureCache::updatedHeaderEntriesFile [secondlife-bin lltexturecache.cpp:1292]
2010-03-29 11:28:42 -06:00
8dd401e4a1
fix for EXT-6678: crash at LLTextureCache::openAndReadEntry [secondlife-bin lltexturecache.cpp:1111]
2010-04-01 11:39:01 -06:00
88df86bcc3
fix for all wierd crashes happening to lltexturecache.cpp, cuased by running viewer 2.0 and viewer 1.23 at the same time. Specifically for the following jiras:
...
EXT-6692: crash at LLTextureCache::readEntryFromHeaderImmediately [secondlife-bin lltexturecache.cpp:1145]
EXT-6691: crash at LLTextureCache::writeEntryToHeaderImmediately [secondlife-bin lltexturecache.cpp:1126]
possible fix for EXT-6567: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170]
2010-04-07 11:51:41 -06:00
af721d3f54
fixing linux build errors from bao's checkin for EXT-6093
...
viewer wouldn't compile under linux, due to gcc being paranoid about a few
things. Fixed them up and got them reviewed.
Code reviewed by bao.
2010-03-18 16:10:24 -04:00
8e1f7ecaf3
more for lltexturecache.cpp: fix the crash due to deleting the entries header file after clearing the texture cache.
2010-03-17 14:43:17 -06:00
f8dc23fc84
fix for EXT-6093: crash at LLTextureCache::updateTextureEntryList[secondlife-bin lltexturecache.cpp:847];
...
EXT-5711: Some textures loading from cache seems jammed;
EXT-5599: Viewer crashes consistently, in Linden Homes region.
2010-03-17 12:39:39 -06:00
fdfc59da9b
debug code for EXT-6093: crash at LLTextureCache::updateTextureEntryList [secondlife-bin lltexturecache.cpp:847]
2010-03-10 17:34:49 -07:00
6a8b63e9de
partial fix for EXT-5711: Some textures loading from cache seems jammed.
...
This fix should be able to improve the speed of loading texturs from cache noticeably (30% or more). More fix to come.
2010-03-07 21:18:10 -07:00
b0d4919fd4
fix for EXT-5683: viewer crashes at llcommon/llworkerthread.cpp(323): ERROR: LLWorkerClass::checkWork: ASSERT(workreq).
2010-03-04 15:02:30 -07:00
c0d361ca3e
more for EXT-4352: texture problem in viewer 2.0. TEXTURE_CACHE_ENTRY_SIZE does not match the FIRST_PACKET_SIZE on the sim side.
2010-02-09 17:45:43 -08:00
eeb30616f6
CID-99
...
Checker: INVALIDATE_ITERATOR
Function: LLAllocatorHeapProfile::parse(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&)
File: /indra/llcommon/llallocator_heap_profile.cpp
not a bug, but make it clearer to coverity.
2010-01-27 13:26:05 -08:00
3aed137a33
CID-101
...
Checker: INVALIDATE_ITERATOR
Function: LLTextureCache::writeComplete(unsigned int, bool)
File: /indra/newview/lltexturecache.cpp
not really a bug, but rearranged a little.
2010-01-27 13:15:13 -08:00
10c6690561
fix for EXT-3553: unknown Crash.
2009-12-29 17:42:54 -07:00
d8e1af9736
Increasing texture cache version to force cache clear of possibly corrupted texture caches from previous 2.0 versions.
...
Enabling Admin menu in God Mode independent of Advanced menu.
2009-11-16 16:48:58 -08:00
651541a899
Fixed a deadlock causing textrue caching to stall.
2009-11-15 22:39:48 -08:00
637b6673bc
More texture cache fixes, including a possible deadlock when the cache was getting purged.
...
Significantly reduced spurrious warnings and delition of non sin-based texture fetch comptabable sided cache files.
2009-11-14 10:22:32 -08:00
f67a8ad12e
Mutex lock fix for texture cache.
...
Also a fix for texture purging when reducing the cache size.
2009-11-13 22:54:55 -08:00
a7fa9c4936
Better fix for edge case where abort call to readComplete() can cause a crash.
2009-11-12 00:07:07 -08:00
63195e76ca
check for NULL to prevent crashing
2009-11-10 22:46:58 +08: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
b01c75cb42
svn merge -r117314:117337
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
abdc99f21b
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
...
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18 21:10:16 +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
b807e3df99
merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes) merge to trunk (for real)
2008-10-08 00:22:32 +00:00
4296542cd0
Roll back of r98854 Accidentally commited merge in progress
2008-10-07 22:49:00 +00:00
c9be97fdfc
merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes) merge to trunk
2008-10-07 22:43:15 +00:00
d725e5b240
QAR-872 Viewer 1.21 RC 3
...
merge viewer_1-21 96116-97380 -> release
2008-09-29 19:14:50 +00:00
da94c0eaa2
QAR-855 Viewer 1.21 RC 2
...
merge viewer_1-21 94770-96059 -> release
2008-09-12 06:27:13 +00:00
Logan Dethrow