summaryrefslogtreecommitdiff
path: root/indra/llmessage/llassetstorage.cpp
AgeCommit message (Collapse)Author
2013-10-25trivial: fix several weird compiling errors.Xiaohong Bao
2013-08-18SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 msRichard Linden
continued conversion to units system made units perform type promotion correctly and preserve type in arithmetic e.g. can now do LLVector3 in units added typedefs for remaining common unit types, including implicits
2013-08-16SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 msRichard Linden
converted many values over to units system in effort to track down source of 0 ping
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-06-05merge with viewer-releaseRichard Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-06renamed LLTrace stat gathering classes/methods to make the structure of ↵Richard Linden
LLTrace clearer Count becomes CountStatHandle Count.sum becomes sum(Count, value), etc.
2012-10-15SH-3405 WIP convert existing stats to lltrace systemRichard Linden
converted all remaining LLViewerStats to lltrace
2011-09-28SH-2276 Remove some log spam to alleviate stalls on login.Dave Parks
2011-05-02mergeDave Parks
2011-04-22STORM-380 FIXED Added syncing animations and sounds before the gesture ↵Seth ProductEngine
starts playing. The actual playing of animations and sounds of a gesture starts only when all needed animations and sound files are loaded into viewer cache. This reduces the delay between animations and sounds meant to be played simultaneously but may increase the delay between the moment a gesture is triggered and the moment it starts playing. Fixed calling assets callback to clean up the void pointer in getAssetData() and avoid potential memory leaks.
2010-12-21Automated merge up from viewer-developmentLoren Shih
2010-12-10ESC-228 ESC-227 Corrections for metrics counters and send-on-quit delivery.Monty Brandenberg
Wanted to avoid computing metrics for duplicate requests as much as possible, they artificially depress averages but missed an opportunity and was including them in the counts. The non-texture case is solid. Textures are.... confounding still. Do a better job of trying to send one last packet to the grid when quitting. It is succeeding now, at least sometimes. Put a comment in base llassetstorage.cpp pointing to cut-n-paste derivation in llviewerassetstorage.cpp so that changes can be replicated. Hate doing this but current design forces it.
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-06-07Merge with render-pipelineDave Parks
2010-05-24Static VFS cache tracingBrad Payne (Vir Linden)
2010-04-21merge from viewer-trunkTofu Linden
2010-04-20CID-462Tofu Linden
Checker: DEADCODE Function: LLAssetStorage::findInStaticVFSAndInvokeCallback(const LLUUID &, LLAssetType::EType, void (*)(LLVFS *, const LLUUID &, LLAssetType::EType, void *, int, int), void *) File: /indra/llmessage/llassetstorage.cpp
2010-04-20slightly hairy merge from viewer-trunkTofu Linden
2010-04-19For EXT-6809 - fixes suggested by Nyx code reviewBrad Payne (Vir Linden)
2010-04-19mergeBrad Payne (Vir Linden)
2010-04-19For EXT-6809 - search static VFS for all asset typesBrad Payne (Vir Linden)
2010-04-16For EXT-6809 - search static VFS for all asset typesBrad Payne (Vir Linden)
2010-04-16For EXT-6809 - search static VFS for all asset typesBrad Payne (Vir Linden)
2010-04-01another hairy merge from viewer-trunkTofu Linden
2010-03-31asset request logging for DEV-47362 investigation.Brad Payne (Vir Linden)
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type ↵Palmer
and more mesh inventory type info
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-07-16Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.Mark Palange
merged all changes, post copy, from the following branches: linden/brachnes/enable-o-v user/cg/qar-1538 user/mani/viewer2-enable-o-v
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew.
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-12-02QAR-1040 maint-viewer-11 + OpenAL combo mergemeAdam Moss
svn merge -c104451 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2008-06-25svn merge -r90394:90492 svn/branches/havok4/qar-689 --> releaseDave Simmons
QAR-689 - branch/havok4/havok4-7 r89805 is ready for merge back into release
2008-05-14Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .Eric Tulla
Passed QA as part of QAR-491.
2008-05-08QAR-570 maint-render-4 mergeSteven Bennetts
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-02-13svn merge -r 79828:79862 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-2008-02-12 --> release QAR-280 - combo merge of: * QAR-249 Allow specifying max http protocol version in eventlet.httpd, and change backbone.py to specify HTTP/1.0 explicitly * QAR-272 Switch logout/disconnect messages to syslog/streambase * QAR-253 Test for the group names fix * QAR-260 metrics-3 for release merge
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04Result of svn merge -r70873:71086 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 ↵Christian Goetze
svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-06-22Tweak initializer order to silence a gcc warning (now treated as error)Josh Bell
2007-06-22svn merge -r 63401:63939 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/derez-asset-loss-1 --> release NOTE: Skipped whitespace-only changes
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-03-30Merge of final upload-queue changes from Branch_1-13-4 --> releaseJosh Bell
svn merge -r 59496:59497 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release svn merge -r 59530:59531 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release svn merge -r 59827:59828 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-4 --> release svn merge -r 59315:59316 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release In order, that's: * back out upload-queue * apply a subset * apply the full thing * re-merge the addition of the DELETE REST Most of which turns into a no-op. Reviewed by don.
2007-03-20svn merge -r59459:59476 ↵Karen Clark
svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
2007-03-15svn merge -r 58433:58660 svn+ssh://svn/svn/linden/branches/upload-queue into ↵Don Kjer
release
2007-02-02Result of svn merge -r57264:57370 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-01-17merge release@56803 release-candidate@56833Steven Bennetts