6f53b2ff18
FIRE-11448: Experimental fix from Monty Linden for HTTP texture fetch issues over cellular networks.
2013-10-10 15:30:48 -05:00
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
23bc05082a
Backed out changeset: 519f1f0aa02f - prep for merge with LL
2013-05-15 16:23:09 -07:00
f13728275a
Backed out changeset: 2880e0926490 - prep for merge with LL
2013-05-15 16:22:01 -07:00
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
9177903931
Merged with Appearance-MixedViewers tip
...
--HG--
branch : .RLVa
2013-04-29 15:39:42 +02:00
41100ac9d3
SH-3850 WIP - fixed some warnings
2013-03-22 13:55:39 -04:00
144194b833
SH-3850 WIP - added some additional debugging output to try to catch gray textures
2013-03-22 13:48:27 -04:00
3359a90b4a
Merged with Appearance-MixedViewers tip
...
--HG--
branch : .RLVa
2013-03-19 22:43:07 +01:00
c7a7347a42
still more build failure fixing
2013-03-19 09:34:58 -04:00
6fe9886133
SH-3980 FIX - fixed most cases of server-bake blurring by disabling caching of server bakes. A better solution is desirable, may not be for initial release
2013-03-18 18:44:21 -04:00
ea9a71972d
Fix for build error
2013-03-18 17:00:48 -04:00
a365d7fb3f
more urgent notification (DEBUG->WARN) for some texture fetch error cases
2013-03-18 16:41:42 -04:00
409e9202dd
merge
2013-03-18 11:46:12 -04:00
e288ff9695
SH-3850 WIP, SH-3959 WIP - added additional debug logging for texture loading
2013-03-15 13:26:31 -04:00
dd1f89d3a9
SH-3975 WIP - consolidated texture fetch state changes to simplify tracking
2013-03-13 17:21:26 -04:00
e0c9174609
merge
2013-03-11 15:05:47 -04:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
5a436e46f6
SH-3959 WIP - pass information about type of fetched image - server bake, host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed
2013-03-08 17:07:17 -05:00
e1526c4048
Merged with Appearance-Misc tip
...
--HG--
branch : .RLVa
2013-02-20 14:26:21 +01:00
2c6da93f49
Merge SSA push 6 incl. backout of f066a2bd972d
2013-04-01 21:26:38 +02: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
cc0a4bf6ac
Merge. Pull viewer-development in prior to filing DRTVWR merge request.
2013-01-09 16:39:30 -05:00
11e506f2eb
SH-3357 Texture fetch debugger not running correctly under drano-
...
http phase 1 Some missing counter initialization kept the debugger
from entering the startup state giving the appearance of a do-
nothing floater. Also found some unbound recursion that might need
looking at in the future. (There's a comment.)
2012-12-21 22:24:34 +00:00
6c3375356e
SH-3331 Fix incorrect overrun message when sending body with HTTP
...
request. During readcallback, would generate an overrun-type message
about reading position beyond end-of-data. Mistake was is messaging
when state is exactly at end of data (which is expected) versus an
overrun. Both result in declaring end-of-data to libcurl. Also
changed some of the status logging for the metrics payload to be
less chatty on success, more informative on error.
2012-12-21 22:21:58 +00:00
7fe4fbe674
Pull in upstream viewer-development via viewer-lion
2012-12-04 15:03:34 -08:00
40e78a80cc
Pull and merge viewer-development
2012-12-04 14:31:15 -08:00
e0432f98ee
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
2012-11-28 16:36:34 -05:00
5d34ac552f
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-11-20 17:03:55 -06:00
d4dc41dbd5
misc error detection, debug coloration for avatar meshes
2012-11-01 14:19:00 -04:00
d6e3b0445a
Merge in viewer-development code and fix build
2012-10-15 14:23:29 -07:00
1709952adb
pull back 3.4.1-beta6 fixes
2012-10-10 21:40:10 -04:00
374f20edf0
Fix non-thread-safe refcounting of LLHTTPClient::Responder and fix out-of-order deletion of LLTextureFetch on shutdown
2012-10-03 14:30:21 -05:00
4091e47cf2
DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.
...
cmake and other files didn't get moved over, do it by hand.
2012-09-08 18:56:43 -04:00
09cd2a4b1a
DRTVWR-209 Additional merge of viewer-development with SH-3316 drano-http code.
...
Restore original deleteRequest/removeRequest implementation removing
a small race. Remove a short-lived additional timeout scheme on requests
which really isn't appropriate as originally implemented as we can have
very long-lived requests on big regions.
2012-09-07 15:08:12 -04:00
04e8d074b2
DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.
...
This was yet another refresh from v-d because of significant changes
to lltexturefetch that would not have been resolvable by casual
application of any merge tool. There are still a few questions
outstanding but this is the initial, optimistic merge.
2012-09-07 12:53:07 -04:00
38acb45af8
Merge in latest viewer-development
2012-09-05 17:17:54 -07:00
41301004e1
Cleanup actions from code review of llappearance with nyx
2012-09-04 22:49:26 +00:00
7b4385420e
More clean-up to closer match original file order. For llavatarappearance diffs
2012-09-04 04:24:47 +00:00
93578f7e51
Automated merge with http://bitbucket.org/lindenlab/viewer-cat
2012-08-24 16:31:29 -07:00
67553c99f6
Pointless edit to tickle TC/codeticket.
2012-08-21 14:02:53 -04:00
7bee4b58ff
SH-3325 texture load slow on some machines
...
This doesn't really address 3325 directly but it is the result of research
done while hunting it down. First, this is a thread safety improvement for
canceled requests that have gone into resource wait state. I don't think
we've seen a failure there but there was a window. It also cleans the
resource wait queue earlier which lets us do less work and get requests
more quickly into llcorehttp by bypassing the resource wait state. With
this, I finally feel comfortable about rundown of requests.
2012-08-21 12:28:51 -04:00
4b86f8983a
SH-3329 Cached scene loads slower than same scene with cleared cache.
...
A/B comparison with original code showed the newer issuing lower-priority
requests of the cache reader and some other minor changes. Brought them
into agreement (this is cargo-cult programming). Made the HTTP resource
semaphore an atomic int for rigorous correctness across threads. I
swear I'm going to tear down this code someday.
2012-08-19 18:51:21 -04:00
9de14fe45b
SH-3327 HTTP transfers not showing up in texture console 'net tot tex' value.
...
Dropped an argument during integration which made the total byte count read
lower than expected. Everything else is fine, however.
2012-08-17 12:33:12 -04:00
efdcf045b0
Merged in from viewer-development.
2012-08-17 08:07:15 -07:00
97106c2dea
merge changes for DRTVWR-194
2012-08-15 17:07:10 -04:00
f5e35cbc53
Merge from viewer-development.
2012-08-13 12:09:04 -04:00
fdb2ae8335
Merge of viewer-development (3.4.1).
2012-08-03 11:57:51 -04:00
58d5e223b8
merge
2012-07-30 15:02:02 -04:00
Tonya Souther