| Age | Commit message (Collapse) | Author | 
|---|
|  |  | 
|  | reviewed by Nyx. | 
|  | Cleanup and log spam reduction. | 
|  |  | 
|  | Diagnostic info. | 
|  | New versions of animations fix looping and other problems, reduced log spam. | 
|  |  | 
|  |  | 
|  |  | 
|  | ignore-dead-branch | 
|  | svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | 
|  |  | 
|  | QAR-648   1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release | 
|  | 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 | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated | 
|  | windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620 | 
|  | svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release
** This should be the last merge from branches/maintenance.  All future merges will be from new maintenance-# branches off release **
ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556
RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa | 
|  | 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 | 
|  | release | 
|  |  | 
|  | svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release | 
|  | 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 | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release | 
|  | useful. no code changes. SL-13762 | 
|  |  |