summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Expand)Author
2012-01-04mergeBrad Payne (Vir Linden)
2011-12-21merge changes for vmrg-209 and vmrg-210 back from beta branchOz Linden
2011-12-15fix for SH-2738 and SH-2777, might also help SH-2723: heap corruptionXiaohong Bao
2011-12-15fix for SH-2738 and SH-2777, might also help SH-2723: heap corruptionXiaohong Bao
2011-12-13storm-1729: ensure that cpu id has no leading or trailing spaces for ease of ...Oz Linden
2011-12-12mergeBrad Payne (Vir Linden)
2011-12-12increment viewer version to 3.2.6Oz Linden
2011-12-12merge changes for vmrg-204Oz Linden
2011-12-09Backed out changeset fafd857891b1Dave Parks
2011-12-08Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-12-07mergeBrad Payne (Vir Linden)
2011-12-07mergeBrad Payne (Vir Linden)
2011-12-06LLSD-14: Extract remaining conditional LLSD mbrs to namespace llsd.Nat Goodspeed
2011-12-05mergeDave Parks
2011-12-05SH-2652 WIP -- Add timers to relevant areas, pause render pipeline while occl...Dave Parks
2011-12-05LLSD-14: Optional entry points need conditional decls turned on.Nat Goodspeed
2011-12-05fix for sh-2738: Texture fetching freezes due to LLcurlXiaohong Bao
2011-12-01Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2011-12-01LLSD-14: Move LLSD::(outstanding|allocation)Count() to free functions.Nat Goodspeed
2011-11-30Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-11-30mergeBrad Payne (Vir Linden)
2011-11-30increment viewer version to 3.2.5Oz Linden
2011-11-28bumped up MSVC warning level to 3 to catch more stuff that gcc catchesRichard Linden
2011-11-28Automated merge with https://bitbucket.org/VirLinden/viewer-development-shini...Xiaohong Bao
2011-11-22trivial: update the memory pool log info to the latest.Xiaohong Bao
2011-11-19Make LLSD diagnostic methods conditional on LLSD_DEBUG_INFO.Nat Goodspeed
2011-11-17LLSD-14: fixed way-too-overloaded local variable.Nat Goodspeed
2011-11-17LLSD-14: Make dumpStats()/calcStats() implementation more robustNat Goodspeed
2011-11-17LLSD-14: while we're in llsd.h anyway, fix longstanding misspellings.Nat Goodspeed
2011-11-17LLSD-14: Fix silly syntax error in subscript bounds check.Nat Goodspeed
2011-11-17LLSD-14: Bring over llsd.{h,cpp} enhancements from server-trunk.Nat Goodspeed
2011-11-14increment viewer version to 3.2.4Oz Linden
2011-11-08increment viewer version to 3.2.3Oz Linden
2011-11-03mergeBrad Payne (Vir Linden)
2011-10-31increment viewer version to 3.2.1Oz Linden
2011-10-31mergeBrad Payne (Vir Linden)
2011-10-25fix for SH-2624: crash at LLPrivateMemoryPoolManager::freeMem: ASSERT (!addr)Xiaohong Bao
2011-10-24Backed out changeset 9bcc2b717663 (restore version number to 3.2.1)Oz Linden
2011-10-22correct version number for 3.2.0 beta 2Oz Linden
2011-10-21merge with viewer-devRichard@Callum-HP-PC.lindenlab.com
2011-10-18increment viewer version to 3.2.1Oz Linden
2011-10-18increment viewer version to 3.2.0Oz Linden
2011-10-18merge changes for STORM-1654Oz Linden
2011-10-17fixed one crash on exitRichard Nelson
2011-10-17merge changes for storm-1651Oz Linden
2011-10-17merge back late changes and tags from release branchOz Linden
2011-10-15Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-10-14b782a75c99e6 backout cleanupDave Parks
2011-10-14Merge backout of b782a75c99e6Dave Parks
2011-10-14Backed out changeset b782a75c99e6Dave Parks
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 13:38:51 +0000