Tofu Linden
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
Tofu Linden
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
Xiaohong Bao
3ac134ec22
EXT-8673: FIXED: UDP texture loading is slower in 2.x viewers than 1.23.5
...
Improved the following:
1, make sure the texture callback queue is properly handled and cleaned in time;
2, estimate the LLVOTree pixel area more accurately;
3, eliminate the possibility of back and forth stopping/restarting a texture fetching
2010-08-18 11:33:01 -06:00
Oz Linden
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
Xiaohong Bao
5be5c3f0da
fix for EXT-7399: 2.0.2 with http textures loads textures slower than 1.23.5 and
...
EXT-7397: decoding textures get stuck in REQ status
2010-08-11 19:31:20 -06:00
Xiaohong Bao
b9cc3a34da
EXT-7399: FIXED: 2.0.2 with http textures loads textures slower than 1.23.5
2010-08-10 16:43:31 -06:00
Xiaohong Bao
8af410aca2
EXT-8596: FIXED: crash at LLTextureFetchWorker::doWork(int) [secondlife-bin lltexturefetch.cpp] line 1061
2010-08-09 17:07:34 -06:00
Xiaohong Bao
8f56413c91
more fix for EXT-7397: decoding textures get stuck in REQ status
2010-08-04 10:55:07 -06:00
Xiaohong Bao
08b74c369f
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
2010-08-03 18:27:58 -06:00
Xiaohong Bao
85c970e847
fix for EXT-7399: 2.0.2 with http textures loads textures slower than 1.23.5
...
and EXT-7397: decoding textures get stuck in REQ status
2010-08-03 18:26:47 -06:00
Palmer
7d73afe895
EXT-7145 - Handle http redirects in viewer properly. Didn't work before.
...
Reviewed by Bao and Babbage
2010-07-22 15:20:45 -07:00
Xiaohong Bao
5c7911f1e2
EXT-7032: POSSIBLE FIXED: [crashhunters] crash in libcurl background thread on windows
2010-06-16 14:03:56 -06:00
Xiaohong Bao
8108de817c
EXT-6567: POSSIBLE FIXED: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170];
...
also removed the debug code for this bug.
2010-06-16 11:42:05 -06:00
Tofu Linden
ea5d8a1634
merge backout
2010-06-07 17:31:59 +01:00
Tofu Linden
3057651b1a
EXT-7145: FIXED: make viewer to handle "URL redirect " for http texture.
...
Backed out changeset e6feef9704cf to re-introduce Bao's fix
2010-06-07 17:31:22 +01:00
Xiaohong Bao
29896d26c2
EXT-7630: FIXED: turn on http texture fetching by default.
2010-06-03 14:08:22 -06:00
Xiaohong Bao
3df90898b1
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
2010-05-28 17:09:48 -06:00
Xiaohong Bao
c1170cfa48
A possible fix for EXT-7032: [crashhunters] crash in libcurl background thread on windows.
...
killed accessing the asset server for map textures after http returns 404.
2010-05-28 17:05:06 -06:00
Tofu Linden
87d0c6d583
Backed out changeset 57e00f7d4d4f
...
(was: EXT-7145: FIXED: make viewer to handle "URL redirect " for http texture.)
This was causing osx/linux build failure.
2010-05-24 07:49:26 +01:00
Xiaohong Bao
9dada6bcc4
EXT-7145: FIXED: make viewer to handle "URL redirect " for http texture.
2010-05-18 14:14:50 -06:00
Xiaohong Bao
9cc9ceb250
EXT-7080 Partial FIXED: Outfit texture updates are not transmitted (in either direction) when HTTP Textures is enabled
...
Fixed baked textures downloading. Uploading will be fixed on the server side.
2010-05-04 11:08:45 -06:00
Xiaohong Bao
87be73be24
fix for EXT-7159: textures are not fully loaded when http-texture is enabled.
...
and EXT-6928: Viewer crashes immediately after enabling HTTP Textures on a http-texture-server-1 simulator
2010-04-28 17:07:24 -06:00
Xiaohong Bao
6837f66038
trivial: convert to unix eol.
2010-04-22 14:32:49 -06:00
Xiaohong Bao
1eebca1431
fix for EXT-6928: Viewer crashes immediately after enabling HTTP Textures on a http-texture-server-1 simulator
...
and EXT-7009: textures fetched through http are never cached.
2010-04-22 14:27:14 -06:00
Xiaohong Bao
fad31dc087
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
2010-03-25 17:46:36 -06:00
Xiaohong Bao
81350ec5a9
more fix for EXT-5711: Some textures loading from cache seems jammed.
...
and possible fix for EXT-5704: FPS drop, and this could be cause freez and crash.
2010-03-25 17:14:27 -06:00
Xiaohong Bao
12a86042f7
fix for EXT-6465: sometimes the texture fetching queue is never empty.
2010-03-18 22:07:25 -06:00
Xiaohong Bao
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
Xiaohong Bao
254db516c5
fix for EXT-5710: improve the raw image reloading process in the texture pipeline; EXT-4612: failing assert LLViewerTexture::setDecodePriority: ASSERT (!mInImageList); EXT-4912: Texture alpha mask is not applied on the first frame after decode.
2010-02-24 12:09:22 -07:00
Xiaohong Bao
03d79f1bf7
some code dents change (nothing else).
2010-02-12 14:21:36 -08:00
Xiaohong Bao
e0e82c908d
more refinement for EXT-4352: texture problem in viewer 2.0.
2010-02-11 18:02:16 -08:00
Xiaohong Bao
13e395aef2
more fix for EXT-4352: texture problem in viewer 2.0. fixed texture priority problem.
2010-02-09 12:53:05 -08:00
Xiaohong Bao
68ea8e13ac
partial fix for EXT-4352. fixed mutex deadlocks and turned on the multi-threaded texture fetching.
2010-02-08 14:40:06 -08:00
Tofu Linden
da3ee22daa
CID-198
...
Checker: RESOURCE_LEAK
Function: LLTextureFetchWorker::doWork(int)
File: /indra/newview/lltexturefetch.cpp
2010-01-27 14:39:59 -08:00
Xiaohong Bao
9d7ad2733e
partial fix for EXT-4352: Texture loading problems in Viewer 2.0. More to come later (next week).
2010-01-15 15:36:43 -08:00
Xiaohong Bao
904de223b6
for DEV-44376: create a switch for texture decoding.
2009-12-29 18:18:52 -07:00
Steve Bennetts
069b410a88
Fix for world map textures not loading with HTTP Texture changes.
2009-12-23 11:24:43 -08:00
Steve Bennetts
fb2bc3a0e0
Better error handling for HTTP Texture code.
2009-12-21 13:15:59 -08:00
Steve Bennetts
90548a46ce
Additional HTTP Texture tunining
...
* Important fix in lltexturefetch.cpp where a 'partial' resonse was incorrectly setting mHaveAllData.
2009-12-18 14:42:41 -08:00
Steve Bennetts
abe0eb2ba7
HTTP Texture changes:
...
* Fixed bug in llqueuedthread.cpp causing unnecesssary sleeeping
* Fixed an issue that was preventing retries on 503 errors
* Added number of pending creates to Texture View
* Increased time allocated for texture creates
2009-12-17 16:19:00 -08:00
Steve Bennetts
710d2a6db3
Fixed an edge case that was triggering an error check when doing HTTP texture fetches.
2009-12-15 14:44:41 -08:00
brad kittenbrink
cb9b874b17
Merge of my old precompiled headers dependency cleanup with tip of viewer-2-0.
2009-12-14 11:07:29 -08:00
Xiaohong Bao
b79d694f6d
replace some magic numbers of http status, and fix for DEV-40952/SNOW-208: HTTP GET requests for textures check for http status 203, but should check for 206.
2009-12-11 20:51:06 -07:00
Steve Bennetts
562d343c47
EXT-3298 world map does not load simulator textures
...
Forgot to add LLCurl update call to non threaded LLTextureFetch update.
2009-12-09 18:18:01 -08:00
brad kittenbrink
8e912657e8
Another merge of include dependency cleanup work with viewer-2-0.
2009-12-07 12:20:47 -08:00
Steve Bennetts
a5c5a6598c
Un-threaded LLTextureFetch to address potential performance and edge case crash issues.
...
Changed an assert to an llerrs with extra info
Added "HTTP Textures" to "Develop" menu
2009-12-03 12:07:18 -08:00
Steve Bennetts
9730dd6a94
Added some threading debugging code. Should catch any recursive mutex locks in non Release builds.
2009-11-23 17:00:53 -08:00
Steve Bennetts
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
brad kittenbrink
1ea60591a9
Refactoring of llviewerprecompiledheaders.h to hopefully increase stability
...
and reduce unnecessary dependencies and incredibuild wedging. Hopefully in
the long run this will reduce build time. Also cleaned up a lot of header
file usage to conform better to the coding standard.
reviewed by james and steve.
2009-11-13 20:33:59 -05:00