| Age | Commit message (Collapse) | Author | 
|---|
|  |  | 
|  | LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton | 
|  |  | 
|  |  | 
|  |  | 
|  | another attempt to move mem stat into base class | 
|  | replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc. | 
|  |  | 
|  |  | 
|  | cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places | 
|  |  | 
|  | cleaned up LLStat and removed unnecessary includes | 
|  | clean up of llstats stuff | 
|  |  | 
|  | and LLBufferArray::copyIntoBuffers | 
|  | crashes. | 
|  | back-out the back-out for this branch.  yay. | 
|  | Backing out this merge that I pushed (prematurely) to the wrong place. | 
|  |  | 
|  |  | 
|  |  | 
|  | DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684
improved text editor (handles multiple fonts simultaneously as well as inline widgets) | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113 | 
|  | svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | 
|  | 101837 to 103519 | 
|  | svn+ssh://svn/svn/linden/qa/sim-metrics/sim-metrics2-release-merge-98903 into release | 
|  | Inventory Descendents - to Release
Related Jiras:
1. DEV-17797 New Top Causes of Inventory Loss is Attachments with null folder_id
2. DEV-17937 null asset id not handled correctly in ais inventory fetch
3. OPSRT-1097 Update python-indra package on the system images
4. DEV-20505 QAR-751: Banning Cap "FetchLibDescendents" results in error in viewer log.
5. DEV-20328 QAR-751 Excessive log spam when using ais viewer against ais sim
6. DEV-20335 QAR-751 AIS bans are missing from message.xml
svn merge -r95983:96590 svn+ssh://svn/svn/linden/branches/ais-for-merge-qar-751 .
Miscellaneous commit:
1. Fixed silly bug in llsd-rest that broke connects to https on a non-standard port | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers | 
|  | into release
Fix for simulator crash (null pointer dereference during lldebugs) | 
|  |  | 
|  | svn+ssh://svn/svn/linden/branches/robust-pump 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
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999 | 
|  | into release | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release | 
|  |  | 
|  |  | 
|  |  |