| Age | Commit message (Collapse) | Author | 
|---|
|  |  | 
|  | replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc. | 
|  |  | 
|  |  | 
|  |  | 
|  | Took out some ugly case statements and stuck those functions into the asset dictionary instead.  This makes the code a lot more centralized/extensible since if we ever add assets, it'll be clear that their fetch/knowable fields need to be added (versus that logic being in some obscure case statement). | 
|  |  | 
|  | This bugs me in a minor way.  Did a search-and-cleanup on various swear words. | 
|  |  | 
|  | Checker: UNINIT_CTOR
Function: LLTransferSourceParamsAsset::LLTransferSourceParamsAsset()
File: /indra/llmessage/lltransfersourceasset.cpp | 
|  | and more mesh inventory type info | 
|  |  | 
|  |  | 
|  |  | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.30
Propagating to trunk: QAR-1705 DEV-29573 QAR-1859 QAR-1804 | 
|  | svn merge -r 128022:128028 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/server__merge__trunk-r127980 to svn+ssh://svn.lindenlab.com/svn/linden/trunk
This is the server-side merge for inventory links, folder links&types, and landmark&callingcard permissions. | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-links__merge__viewer-2.0.0.3-r127634 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
For DEV-36425 : Viewer merge for Folder Links and Types [VIEWER]
Test plans - EXTERNAL
* [ Test against a 1.30 server ]
* Test various inventory operations -- move, copy, paste-as-link, etc. on both folders and inventory items.
* Test ability to change user-created folder types.  Test inventory operations on these folder types.
Test plans - INTERNAL
* Test against any inventory smoke tests.
* See test plan in QAR-1643 for full FolderLinks&Types test plan. | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 | 
|  | ignore-dead-branch | 
|  | svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | 
|  | 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 | 
|  |  | 
|  |  |