summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Expand)Author
2010-01-04Merge from trunk. Conflicts manually resolved in:Tofu Linden
2009-12-22Add lleventhost queries to list LLEventAPIs or describe one.Nat Goodspeed
2009-12-21mergerichard
2009-12-21added optional timing of fast timers themselvesrichard
2009-12-21Fix for OSX hating thread local state (hopefully).Dave Parks
2009-12-18Fix for compiler errors introduced in merge.Dave Parks
2009-12-18Merge with viewer-2-0Dave Parks
2009-12-17HTTP Texture changes:Steve Bennetts
2009-12-15mergeDave Parks
2009-12-14Fix for mac build post-merge.brad kittenbrink
2009-12-14Merge of my old precompiled headers dependency cleanup with tip of viewer-2-0.brad kittenbrink
2009-12-14Merging in latest viewer 2Palmer Truelson
2009-12-14Resolved timeout issues in mesh HTTP transfer.Dave Parks
2009-12-11HTTP Mesh fetch FTW.. still bustedDave Parks
2009-12-08EXT-3158 - Removing logging of users password hash from new login code.Mark Palange (Mani)
2009-12-07Fixups for things broken after the last merge and for the linux build.brad kittenbrink
2009-12-07Merge of viewer 2 changesPalmer
2009-12-07Another merge of include dependency cleanup work with viewer-2-0.brad kittenbrink
2009-12-03MergeMark Palange (Mani)
2009-12-03Fix to windows build breakages.Mark Palange (Mani)
2009-12-03Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-12-03Merge of include dependency cleanup work with viewer-2-0brad kittenbrink
2009-12-03DEV-43463: swap visit_and_connect() overloads for Linux compilerNat Goodspeed
2009-12-03Fixed broken buildskolb
2009-12-03Merge with recent viewer-2-0Nat Goodspeed
2009-12-03Skip logging test that fails on Linux, no idea whyNat Goodspeed
2009-12-03Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-11-30Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-11-30Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-11-30DEV-43463: Keep LLEventPump's LLStandardSignal alive during post()Nat Goodspeed
2009-11-25Merge of viewer 2Palmer Truelson
2009-11-23mergeSteve Bennetts
2009-11-23Added some threading debugging code. Should catch any recursive mutex locks i...Steve Bennetts
2009-11-20mergeJames Cook
2009-11-20Merging heads, hmm.Tofu Linden
2009-11-20EXT-2618 Added code to determine if the viewer is running 'compatibility mode'Mark Palange (Mani)
2009-11-20mergeJames Cook
2009-11-19 EXT-2094 Add click-to-zoom as a one-click settable option for objectsangela
2009-11-19branch mergeangela
2009-11-18Switch some files to Unix line endingsBryan O'Sullivan
2009-11-18Merge from product-engineSteve Bennetts
2009-11-18Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-18Allow USE_GOOGLE_PERFTOOLS to be set to on. For memory managerPalmer
2009-11-18Fixed major bug EXT-2532-IM timestamp is when message is viewed, not when it ...Eugene Kondrashev
2009-11-18EXT-2094angela
2009-11-17Merge of viewer2 into avpEric M. Tulla (BigPapi)
2009-11-17Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-16mergeLoren Shih
2009-11-14mergeSteve Bennetts
2009-11-13Mutex lock fix for texture cache.Steve Bennetts