| Age | Commit message (Collapse) | Author | 
|---|
|  |  | 
|  | This was broken long ago in viewer-2.0.0-2 when someone made the decision to stop passing in ObjectID to the texture preview floater. | 
|  | Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel.
--HG--
branch : avatar-pipeline | 
|  |  | 
|  | holding two member variables mObjectUUID and mObjectID.  mObjectID was null for scripts.  It appears to be used only for notecards (?), so I converted it to mNotecardObjectID and switched references to point to mObjectUUID.  Renamed one other variable to mSaveObjectID for clarity.  Removed unnecessary include files and de-inlined a couple functions because I was there.  Reviewed with Steve. | 
|  | ignore-dead-branch | 
|  | svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | 
|  | QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release) | 
|  | 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191 | 
|  | svn+ssh://svn/svn/linden/branches/maintenance-3 into release
ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release | 
|  | 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/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into 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 | 
|  |  | 
|  | release | 
|  |  | 
|  | svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. | 
|  |  |