f657f5a428
SH-2276 Remove some log spam to alleviate stalls on login.
2011-09-28 15:54:02 -05:00
a25f898703
merge
2011-05-02 14:52:12 -05:00
e26bfe00ef
STORM-380 FIXED Added syncing animations and sounds before the gesture 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.
2011-04-22 01:07:52 +03:00
4e98895719
Automated merge up from viewer-development
2010-12-21 10:39:35 -05:00
4bab98f5cd
ESC-228 ESC-227 Corrections for metrics counters and send-on-quit delivery.
...
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-12-10 16:05:19 -05:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
f461ae214c
Merge with render-pipeline
2010-06-07 23:05:22 -05:00
670e316dd7
Static VFS cache tracing
2010-05-24 18:05:15 -04:00
b95aef17ff
merge from viewer-trunk
2010-04-21 11:32:15 +01:00
42cbea759c
CID-462
...
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-20 18:16:57 +01:00
f33fff7e15
slightly hairy merge from viewer-trunk
2010-04-20 12:41:00 +01:00
aa5e494e0c
For EXT-6809 - fixes suggested by Nyx code review
2010-04-19 13:52:59 -04:00
c5e338f240
merge
2010-04-19 10:13:49 -04:00
695e4bc171
For EXT-6809 - search static VFS for all asset types
2010-04-19 10:00:06 -04:00
3b8ce1d18a
For EXT-6809 - search static VFS for all asset types
2010-04-16 17:13:11 -04:00
142f867d38
For EXT-6809 - search static VFS for all asset types
2010-04-16 16:06:34 -04:00
bb4836f53d
another hairy merge from viewer-trunk
2010-04-01 13:45:21 +01:00
2208e6da2c
asset request logging for DEV-47362 investigation.
2010-03-31 16:09:34 -04:00
6f3536d597
Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and more mesh inventory type info
2009-11-11 15:16:49 -08:00
35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +00:00
3e80fa3dbc
Sync up with render-pipeline-7 ignore-dead-branch
2009-11-02 19:55:37 +00:00
0274c1f2b1
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
...
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-07-16 17:54:58 +00:00
e188badaf2
QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
...
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
2009-02-03 17:56:26 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
fd46865a50
QAR-1040 maint-viewer-11 + OpenAL combo mergeme
...
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
2008-12-02 20:35:40 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
580f9088b4
svn merge -r90394:90492 svn/branches/havok4/qar-689 --> release
...
QAR-689 - branch/havok4/havok4-7 r89805 is ready for merge back into release
2008-06-25 16:22:00 +00:00
e77de5d685
Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .
...
Passed QA as part of QAR-491.
2008-05-14 21:37:13 +00:00
63e7894148
QAR-570 maint-render-4 merge
...
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-05-08 18:41:20 +00:00
54e428d209
svn merge -r 79828:79862 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
2008-02-13 01:02:09 +00:00
5595a99623
Result of svn merge -r71162:71205 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-04 23:19:43 +00:00
4942a7b779
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
2007-10-04 16:31:48 +00:00
ce0a5fe145
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
...
Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-21 22:17:53 +00:00
7235476025
Tweak initializer order to silence a gcc warning (now treated as error)
2007-06-22 20:56:24 +00:00
55c92418ef
svn merge -r 63401:63939 svn+ssh://svn.lindenlab.com/svn/linden/branches/derez-asset-loss-1 --> release
...
NOTE: Skipped whitespace-only changes
2007-06-22 18:23:39 +00:00
1c909afe39
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
2007-05-02 21:24:47 +00:00
ffc6680d95
Merge of final upload-queue changes from Branch_1-13-4 --> release
...
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-30 17:23:42 +00:00
fceae96eb1
svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
2007-03-20 22:21:42 +00:00
0947e139ed
svn merge -r 58433:58660 svn+ssh://svn/svn/linden/branches/upload-queue into release
2007-03-15 00:54:39 +00:00
305c74d516
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-02-02 17:28:58 +00:00
71d28bdbf0
merge release@56803 release-candidate@56833
2007-01-17 23:02:00 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Dave Parks