0669906f4b
Merge axon
2018-01-04 15:53:22 +01:00
2e6e6c4346
MAINT-8104 - make pausing of wireframe updates a little smarter - waits for a couple of frames to make sure state is current before starting to skip LLRiggedVolume::update()
2017-12-20 16:26:17 +00:00
13ea9a242a
Merge Firestorm LGPL
2017-10-11 20:30:12 +02:00
299592e88e
merge
2017-10-11 14:16:39 +01:00
01d8e7e347
Merge axon
2017-09-20 01:09:14 +02:00
a2d1b201aa
Merge Firestorm LGPL
2017-08-23 09:35:01 +02:00
9c75a8105c
Experimental fix for animation speed of impostored avatars, based on a fix of Henri Beauchamp
2017-08-20 18:06:09 +02:00
1b9e6225c8
SL-763 - added some additional logging related to animation playback speed
2017-07-28 13:39:54 +01:00
c8fc414ebe
MAINT-7329 Viewer was spamming log with motion limit messages
2017-07-04 16:25:41 +03:00
919521d121
Merge Firestorm LGPL tip
2016-05-21 19:02:00 +02:00
f47ceb47bb
merged jelly-doll viewer-release into bento
2016-05-21 08:15:28 -04:00
f8ee9ffce6
SL-333 work - attachment joints now get a valid mJointNum, more checking on valid joint num values. Also reduced log spam slightly.
2016-02-03 16:52:27 -05:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
ae028e7987
removed unused data structures
2013-04-11 19:08:57 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
2126cdb9a2
MAINT-1560 : Make Slow Motion Animations affect all avatars. Added new menu.
...
Reviewed by Kelly
2012-10-31 15:05:52 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
6081ad52c3
Improved default animations - work in progress
2010-05-06 19:10:11 -04:00
2927ae2fa4
Improved default animations - work in progress
2010-04-26 17:45:32 -04:00
063a7a531a
Improved default animations - work in progress
2010-04-23 16:00:12 -04:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +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
926ea0b39a
QAR-669 1.20 Viewer RC11
...
QAR-648 1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
2008-06-27 21:02:01 +00:00
3855896097
EFFECTIVE MERGES:
...
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release
ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release
dataserver-is-deprecated
2008-05-19 17:02:33 +00:00
d273ba2ce2
Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
2008-05-07 20:48:38 +00:00
e1e1212daa
QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated
2008-05-07 17:17:42 +00:00
6d52efe452
Merge of windlight into release (QAR-286). This includes all changes in
...
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +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
7138fb673a
Merge down from Branch_1-18-1:
...
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
2007-08-02 01:18:34 +00:00
e5124431b5
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
2007-07-02 17:10:30 +00:00
28435a0898
NOTE: Partial merges of the maintenance branch up. The bulk of maintenance 62831:63347 is awaiting final QA and merging, post 1.17.0
...
svn merge -r 63182:63183 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
svn merge -r 63341:63342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
svn merge -r 63420:63421 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Rush in the following fixes:
* SL-27250 "Stop All Animations" doesn't work when stuck in a pose after teleporting
* SL-44718 VWR-1040: crash when opening several gestures quickly
* SL-44326 recurring error message in agni nightly #1
2007-06-11 18:24:15 +00:00
ea8fb7238e
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-31 01:41:19 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Ansariel