Commit Graph

378 Commits (dcd74c98dc5ab1373f1e7f692fd30dee92472acf)

Author SHA1 Message Date
Mnikolenko Productengine 0aaf5284dc Merge branch 'master' into DRTVWR-539
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
2022-03-02 00:46:10 +02:00
Brad Payne (Vir Linden) e5cd9cb90f merge 2021-10-22 18:11:48 +01:00
Dave Parks d00272e0cc SL-16099 Multi-threaded OpenGL usage on Windows, enable Core Profile and VAOs by default. 2021-10-11 16:03:40 +00:00
Brad Payne (Vir Linden) a184a0fbee SL-15999 - noninteractive mode: create minimal objects,load no textures 2021-09-28 20:10:06 +01:00
Mnikolenko Productengine 3950341916 SL-15177 Added LLTextureFetchTester to log texture fetching state timers 2021-04-29 17:37:26 +03:00
Andrey Kleshchev 2938b8238c SL-12889 Failed to cache image crashes 2020-05-25 23:59:56 +03:00
andreykproductengine d081df14ef SL-11309 Crash on attempt to costruct singletone 2019-05-29 19:28:52 +03:00
maxim_productengine a6cc3b7159 SL-11074 FIXED "Cache Hit Rate" in Statistics is broken 2019-05-06 17:14:55 +03:00
AndreyL ProductEngine 65bf63c973 Merged in lindenlab/viewer-bear 2019-04-02 22:12:55 +03:00
andreykproductengine 26fae750ba SL-10291 Replace apr_mutex with standard C++11 functionality 2019-01-14 22:04:44 +02:00
Graham Linden 524fbefd2a Merge 2018-06-27 15:28:26 +01:00
Graham Linden graham@lindenlab.com c0413250b7 Merge 5.1.5 2018-05-18 19:25:54 +01:00
Graham Linden graham@lindenlab.com c0e16b2800 Add stats for tex cache read / decode / fetch latency for comparison of old cache code with TCO. 2018-04-11 20:14:33 +01:00
Andrey Kleshchev 6e445e82e2 MAINT-8091 Removed deprecated and unused private memory pooling 2018-01-30 14:03:26 +00:00
andreykproductengine 34d3b49d1f MAINT-2124 Texture allocation issues 2017-12-05 17:54:17 +02:00
Kitty Barnett 18fa2e6471 MAINT-7081 [FIXED] Access (write) violation / buffer overrun in LLTextureFetchWorker::doWork()
The trouble lines are:
			U8 * buffer = (U8 *) ALLOCATE_MEM(LLImageBase::getPrivatePool(), total_size);
			if (cur_size > 0)
			{
				memcpy(buffer, mFormattedImage->getData(), cur_size);
			}

If 'cur_size > mHttpReplyOffset + append_size' then 'total_size -= src_offset' will cause
total_size to be smaller than cur_size causing a write access violation on the memcpy.

Since the response is invalid it seemed best to make it follow the other failed partial condition.
(transplanted from 737e28ec6b4d74f3ff915a4effc13d7b615a6a9b)
2017-10-12 22:55:15 +02:00
andreykproductengine 72b0cb1467 MAINT-7779 Logging update 2017-10-18 16:31:36 +03:00
andreykproductengine 5cd56406ab SL-683 Fixed Logging parameters not taking effect immediately 2017-09-20 15:53:34 +03:00
Brad Payne (Vir Linden) 8528a9ae13 MAINT-7343 - improved error case handling and checking for unlikely corners 2017-05-09 10:58:43 -04:00
Brad Payne (Vir Linden) b7b8d6e1ae MAINT-7343 - added periodic logging of state of the asset store. 2017-04-26 12:39:14 -04:00
Brad Payne (Vir Linden) a1b6e9b438 MAINT-7166 - diagnostics for movement 2017-03-29 20:29:40 -04:00
Brad Payne (Vir Linden) ca74323ee8 SL-409 - added version field = 2 to asset stats, made viewer-side metrics files exactly match the payload sent to simulator. 2017-03-21 08:56:30 -04:00
Brad Payne (Vir Linden) e9c786ec60 SL-409 - fixes for viewer asset metrics. Copy and/or assignment of Recording objects is failing, changed to create LLSD blob earlier and just copy that. 2017-03-10 11:29:48 -05:00
Brad Payne (Vir Linden) f028290c9e SL-409 - added size stats to metrics for textures 2017-03-07 08:06:03 -05:00
Brad Payne (Vir Linden) 09a6daabd2 SL-409 - consolidated user of ViewerAsset cap for mesh and texture fetching as well. 2017-03-06 14:31:31 -05:00
Oz Linden 950c41d184 merge 4.0.4-release and MAINT-5974 2016-05-06 10:28:42 -04:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04: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
Rider Linden b8c1976460 Merge 2016-03-17 13:14:21 -07:00
Oz Linden 31f3db0291 merge changes for DRTVWR-417 2016-03-16 13:08:06 -04: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
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
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
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
andreykproductengine ccec3d40bd MAINT-8468 Increase max bandwidth on the viewer to 6mbps 2018-03-30 16:47:29 +03: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
Nat Goodspeed 6be2f0ba2b Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2014-11-14 08:49:08 -05:00