summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2010-01-22Merge from v2 trunk.Tofu Linden
2010-01-22Fix assert in lldictionary as used by llfoldertypeRick Pasetto
Review #88 This assert might be valid in general, but LLFolderType has a valid reason for getting "not found"
2010-01-21Turn on llassert() and llverify() for RelWithDebInfo builds.Tofu Linden
Convert top firing asserts into big warnings. To be reviewed by Mani.
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
2010-01-20Convert all C++ files to Unix line endingsBryan O'Sullivan
2010-01-15fix for gcc buildrichard
2010-01-15wrong line endingsrichard
2010-01-15fix for build error in xmmintrins.hrichard
2010-01-14Backed out changeset f34a69c2af56Tofu Linden
(this backs-out my backout, now that I'm happy the original merge works okay :))
2010-01-14Backed out changeset d5b761982e63Tofu Linden
This got pushed too early - sorry. Sigh.
2010-01-14Merge from viewer2, including fix for the test failure biting qarl.Tofu Linden
Minor conflict in llviewerfloaterreg.cpp resolved.
2010-01-13fix for mac fast timer resetting too oftenrichard
2010-01-13better commented fix for VS2005 compile issuesrichard
reviewed by Leyla
2010-01-13potential fix for build issues on vs2005richard
2010-01-11renamed LLFastTimerUtil to LLFastTimerrichard
2010-01-08fast timer performance tuningrichard
2010-01-04Merge from trunk. Conflicts manually resolved in:Tofu Linden
U indra/llui/lluictrlfactory.cpp U indra/newview/llinventorybridge.cpp U indra/newview/llviewertexture.cpp U indra/newview/llviewertexture.h
2009-12-22Add lleventhost queries to list LLEventAPIs or describe one.Nat Goodspeed
Add LLEventDispatcher::getDispatchKey() to retrieve a previously- inaccessible value.
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
* Fixed bug in llqueuedthread.cpp causing unnecesssary sleeeping * Fixed an issue that was preventing retries on 503 errors * Added number of pending creates to Texture View * Increased time allocated for texture creates
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)
Reviewed by Brad
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)
Reviewed by Brad
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
Replace LLEventPump's boost::scoped_ptr<LLStandardSignal> with boost::shared_ptr. Take a local stack copy of that shared_ptr in post() methods, and invoke the signal through that copy. This guards against scenario in which LLEventPump gets destroyed during signal invocation. (See Jira for details.) Re-enable Mani's test case that used to crash. Introduce ll_template_cast<> to allow a template function to recognize a parameter of a particular type. Introduce LLListenerWrapper mechanism to support wrapper objects for LLEventPump listeners. You instantiate an LLListenerWrapper subclass object inline in the listen() call (typically with llwrap<>), passing it the real listener, trusting it to forward the eventual call. Introduce prototypical LLCoutListener and LLLogListener subclasses for illustrative and diagnostic purposes. Test that LLLogListener doesn't block recognizing LLEventTrackable base class bound into wrapped listener.
2009-11-25Merge of viewer 2Palmer Truelson
2009-11-23mergeSteve Bennetts
2009-11-23Added some threading debugging code. Should catch any recursive mutex locks ↵Steve Bennetts
in non Release builds.
2009-11-20mergeJames Cook