summaryrefslogtreecommitdiff
path: root/indra/llcommon/llmemory.cpp
AgeCommit message (Collapse)Author
2011-10-17merge changes for storm-1651Oz Linden
2011-10-14b782a75c99e6 backout cleanupDave Parks
2011-10-10fix for SH-2464: Crash on exit in LLPrivateMemoryPoolManager::freeMemXiaohong Bao
2011-09-07fix for VWR-26864: Recent commit to Snowstorm project introduces frequent ↵Xiaohong Bao
errors and crashes associated with private memory pool.
2011-09-02re-write the hash table code to eliminate potential flaws and simplify the ↵Xiaohong Bao
implementation.
2011-07-20add a debug setting "MemoryPrivatePoolEnabled" to turn on/off private memory ↵Xiaohong Bao
pool.
2011-07-20fix a merge errorXiaohong Bao
2011-07-19fix for memory alignment to 16 bytes.Xiaohong Bao
2011-07-15Merge from viewer-developmentXiaohong Bao
2011-05-11fix a crashXiaohong Bao
2011-05-11fix a crashXiaohong Bao
2011-05-10fix a linux compiling error.Xiaohong Bao
2011-05-10add debug mode to track the memory allocation/deallocation.Xiaohong Bao
2011-04-04fix an issue on mac and linux, also fix an assertion.Xiaohong Bao
2011-04-04fix the bug for mac and linux of continuously adjusting memory.Xiaohong Bao
2011-02-24fix the compiling error: "free" is defined and in use globally.Xiaohong Bao
2011-02-23add types to LLPrivateMemoryPoolXiaohong Bao
2011-02-23fix a merge errorXiaohong Bao
2011-02-23fix an assert errorXiaohong Bao
2011-02-23Automated merge with ssh://hg.lindenlab.com/bao/private-memory-poolXiaohong Bao
2011-02-23Merge from viewer-developmentXiaohong Bao
2011-02-01Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-01-28trivial: convert to "unix return"Xiaohong Bao
2011-01-26add "pause" function for SH-846: design and implement the debug code to ↵Xiaohong Bao
locate memory leaking
2011-01-26for SH-846: design and implement the debug code to locate memory leakingXiaohong Bao
2011-01-12trivial: fix some mac compiling errorsXiaohong Bao
2011-01-07fixed a hash bug, enlarged the overhead for large allocations, and add new ↵Xiaohong Bao
chunk to the tail of the linked list so new allocations go to oldest chunks first.
2011-01-06fix an exit crash.Xiaohong Bao
2011-01-06add the class LLPrivateMemoryPoolManagerXiaohong Bao
2011-01-06removed some debug code, redesigned the hash function, fixed bugsXiaohong Bao
2011-01-04a wroking version with a lot of debugging code (to be removed).Xiaohong Bao
2010-12-08test code and some code changeXiaohong Bao
2010-12-03first iteration of memory pool codeXiaohong Bao
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-05-21Fix up the SSE stuff so it compiles on Linux. Though I don't think it ↵Tofu Linden
actually works properly.
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew.
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated
2008-06-27QAR-669 1.20 Viewer RC11Steven Bennetts
QAR-648 1.20 Viewer RC10 merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-05-08QAR-570 maint-render-4 mergeSteven Bennetts
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-09-14EFFECTIVE MERGE: svn merge -r 68118:68999 ↵Don Kjer
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
2007-07-18svn merge -r64837:65485 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release (only inside indra) (josh) Original log message was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance bos updated it to be: svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance However, it appears it actually was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance ... missing some file additions.
2007-03-31svn merge -r 59364:59813 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-02-17merge -r 56779:58057 /branches/selection_managementRichard Nelson
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 18:39:56 +0000