Commit Graph

409 Commits (ea49fe4d8246d1143c4a3aab01aa92e00ae6ae45)

Author SHA1 Message Date
Ansariel a0188a5358 Merge Firestorm LGPL 2016-05-09 12:41:24 +02:00
Ansariel 2797c5938a Merge Firestorm LGPL 2016-04-05 10:47:23 +02:00
Ansariel df4205dc46 Merge viewer-bear 2016-04-02 03:52:29 +02:00
Nicky a50faa943c Merge. 2016-04-01 12:59:37 +02:00
AndreyL ProductEngine 0ff6fa576a Merged in lindenlab/viewer-bear 2016-04-01 06:18:49 +03:00
andreykproductengine 0e155c51a9 MAINT-6257 Textures loading issues. 2016-03-29 18:52:54 +03:00
Ansariel d171e16c58 Merge Firestorm LGPL 2016-03-18 10:16:25 +01:00
Rider Linden b8c1976460 Merge 2016-03-17 13:14:21 -07:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
andreykproductengine 30f9287645 MAINT-2199 reverted previous change, refixed missing cloud and ban line 2016-03-03 00:15:33 +02:00
andreykproductengine b3e7fff9ae MAINT-2199 restored original UI mechanics, removed icons from UI list 2016-02-27 16:06:54 +02:00
Ansariel 0a741843ca Merge viewer-bear 2016-02-21 02:35:15 +01:00
andreykproductengine 10e2bd56c1 MAINT-2199 In some rare cases priorities can change, it shouldn't affect texture list. 2016-02-18 17:35:43 +02:00
andreykproductengine a0e9ee4757 MAINT-2199 separating UI elements from in-world textures. 2016-02-16 20:44:53 +02:00
Nicky 6b0da7af72 Merge. 2016-01-17 01:05:13 +01:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Rider Linden e7eaa94dfa Merge VR 2016-01-15 13:36:38 -08:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel 8972d313fa Merge viewer-bear 2015-10-30 15:50:00 +01:00
Nicky c218e524b2 Merge - Step 1; Still enough to do. 2015-10-26 20:20:13 +01:00
ruslantproductengine dc2cb70e81 MAINT-4360 FIXED (Setting LogTextureDownloadsToSimulator causes a viewer crash)
The fix in fllowing:
LLTextureFetch has object LLTextureInfo which is has Recorder object.

The recorder object activate (Recorder::handleStart()) self AccumulatorBufferGroup
(Recorder::mBuffers into the current (LLTrace::get_thread_recorder()) ThreadRecorder object
which created (as I understand) one per thread, and time to time send accumulated data to the master ThreadRecorder.

The problem is that LLTextureFetch also can uses from the main thread.
I decide add parameter to CTOR LLTextureInfo(bool postponeStartRecoreder) -
if it false the recorder start immediatly in LLTextureInfo CTOR body, if true we need to start it manually.

Also I add another one LLTextureInfo  in LLTextureFetch::mTextureInfoMainThread which is intended
for accumulate data from the main thread.
The postponed Recorder started/stoped from LLTextureFetch::startThread()/endThread().
2015-10-21 18:47:24 +03:00
Rider Linden 3fdd5abf96 MAINT-5732: Issue in texture_load example and some comments regarding NoOpDeletor 2015-10-15 10:12:58 -07:00
rider eca891e261 MAINT-5732: Fixes for Mac build 2015-10-15 09:32:19 -07:00
Rider Linden bbb9d4f21b MAINT-5732: Change to the way event polling handles error conditions and cancel calls.
Refactor any remaining LLCore::HTTPHandlers to use boost::shared_ptr
Started minor refactor in the materials manager into coroutines (unfinished)
2015-10-14 17:46:24 -07:00
Rider Linden 7c61728b4b MAINT-4952: Removed a bit of debug code that got included accidentally and change host == LLHost() to host.isInvalid() 2015-08-24 14:19:30 -07:00
Nat Goodspeed 62527e6f18 MAINT-5506: Fix ugly timing bug in llurlentry static initialization.
The problem was that class-static LLUrlEntryParcel::sRegionHost was being
initialized by copying class-static LLHost::invalid. Naturally, these two
statics are initialized in different source files. Since C++ makes no promises
about the relative order in which objects in different object files are
initialized, it seems we hit a case in which we were trying to initialize
sRegionHost by copying a completely uninitialized LLHost::invalid.
In general we might attempt to address such cross-translation-unit issues by
introducing an LLSingleton. But in this particular case, the punch line is
that LLHost::invalid is explicitly constructed identically to a
default-constructed LLHost! In other words, LLHost::invalid provides nothing
we couldn't get from LLHost(). All it gives us is an opportunity for glitches
such as the above.
Remove LLHost::invalid and all references, replacing with LLHost().
2015-08-18 17:05:29 -04:00
Rider Linden fe5567639d Change HttpOptions::ptr_t to be shared_ptr<> rather than intrusive. 2015-07-08 12:09:36 -07:00
Rider Linden 1138c57f9a Convert LLCore::HttpHeaders to use shared_ptr<> rather than an intrusive_ptr<> for refrence counting. 2015-07-08 10:01:27 -07:00
Oz Linden aa630cac08 merge buildcleanup 2015-06-25 12:13:10 -04:00
Rider Linden 0d3fb07bfa Remove vestigial httpclient.h include from files that no longer need it. 2015-06-03 16:04:40 -07:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Ansariel ee26f9edf8 Force HTTP textures and inventory both enabled on Second Life; Contains code originally developed by Lirusaito Faers, with permission to use under LGPL
HTTP Inventory menu option in Developer menu has been restored, but both
HTTP Inventory and HTTP Textures will be hidden when logged into SL.
2015-04-25 01:58:39 +02:00
Nat Goodspeed 6be2f0ba2b Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2014-11-14 08:49:08 -05:00
callum_linden 577a3973ea Update to build on Xcode 6.0: Large (and final) collection of fixes for unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake 2014-10-20 14:00:39 -07:00
Tank_Master 4a6ff8c50d Merge LL 3.6.19 2015-01-14 20:20:35 -08:00
Ansariel 4dc6285816 Merge LL V3.7.15 2015-01-14 13:06:49 +01:00
Ansariel eb2f35764e Merge LL V3.7.14 2015-01-13 23:04:32 +01:00
Ansariel 1f465086c0 Merge LL V3.7.10 2015-01-11 18:40:22 +01:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
Monty Brandenberg 11036d7bf4 Cleanup work. Use http constants for content-type and
accept headers in mesh and textures.  For texture metrics
reporting, use the AP_INVENTORY policy class which is
non-pipelined and pointing (usually) in the right direction.
Use a do-while(false) structure to manage common exit path
code in onCompleted() methods.  Identical to a 'goto' but
might amuse the pedantic.  Tuning on background fetch to
have it cycle faster.  This is experimental.  I suspect
with HTTP balancing in llcorehttp, we can do away with the
timers here.
2014-09-19 19:43:25 -04:00
Monty Brandenberg f71c6c745b Cleanup pass. Documentation. Get older llcorehttp-using
code to use utils for any LLSD interfaces.
2014-09-09 15:36:35 -04:00
Monty Brandenberg bff5a4e794 Merge. Update from viewer-release after 3.7.15 release. 2014-09-08 15:24:22 -04:00
Oz Linden d3c63401d2 merge changes for 3.7.14-release 2014-08-18 14:38:46 -04:00
Monty Brandenberg e79a88c8cc Better support for dynamic option changes in llcorehttp. Libcurl has
some problems disabling pipelining on a multi handle with outstanding
requests so build a more conservative system that allows requests
to drain before setting curl multi options.  Would rather not have
this but it is significantly safer.  "HttpPipelining" debug setting
is now fully dynamic.  Connection limits can also be made dynamic
in the near future.  Upped the default connection count back to 8 for
now but will revisit this in the tuning phase.  It might be time to
combine mesh and textures into a single asset class.  For normal
server operations that would be a clear path, but for server under
load, the current scheme may be better.  Minor cleanup in logging
to elminate some redundant strings.  Might add some more tracing to the
stall logic 'just in case'.
2014-08-12 18:21:26 -04:00
Monty Brandenberg 5dffe16aef Add 'HttpRangeRequestsDisable' debug setting to inhibit use of 'Range:' header.
Intended for users with bad networking gear or twitchy ISPs, if set to
True, forces plain GET requests to asset servers for textures and meshes.
This change kicked off a slight refactor in the mesh repository code which
made it resilient against unexpected 200's and responses not covering
the requested start range.  There's still too much data copying in the
Mesh code (always has been).  Would love to fix that and get rid of the
monolithic temp buffer.  Cleaned up white space damage caused by unnamed
linden who likes to drag his magical editor through code.
2014-08-11 14:38:47 -04:00
Monty Brandenberg 8fe0084108 Merge. Refresh from viewer-library-refresh after 3.7.13 release. 2014-08-04 21:35:57 +00:00
Oz Linden e5f6c2faa0 add some debug logging 2014-08-04 14:44:35 -04:00
Aura Linden fb7c5efe32 Pulled in fix for maint-4184 blurry textures 2014-08-01 14:26:33 -07:00
Aura Linden 342833534f Improved comments 2014-07-23 09:16:48 -07:00
Aura Linden 3d4acb535d Appears to fix MAINT-4184 2014-07-22 17:24:00 -07:00