summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2010-02-25automated merge from trunkRoxie Linden
2010-02-25warn-on-failure:unix-eolRoxie Linden
automated merge from trunk
2010-02-25automated merge from trunkRoxie Linden
2010-02-25automated mergeRoxie Linden
2010-02-25Automated mergeRoxie Linden
2010-02-24Automated mergeRoxie Linden
2009-12-07Fixups for things broken after the last merge and for the linux build.brad kittenbrink
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-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
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)
OS version string reports compatibility mode and real os version number, if accessible. reviewed by Richard
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
Reviewed by Bao
2009-11-18Fixed major bug EXT-2532-IM timestamp is when message is viewed, not when it ↵Eugene Kondrashev
was sent and received. Time str from the arriving message used now instead of constructing it dynamicly. --HG-- branch : product-engine
2009-11-18EXT-2094angela
2009-11-17Merge of viewer2 into avpEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-11-16mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-11-14mergeSteve Bennetts
2009-11-13Mutex lock fix for texture cache.Steve Bennetts
Also a fix for texture purging when reducing the cache size.
2009-11-13Refactoring of llviewerprecompiledheaders.h to hopefully increase stabilitybrad kittenbrink
and reduce unnecessary dependencies and incredibuild wedging. Hopefully in the long run this will reduce build time. Also cleaned up a lot of header file usage to conform better to the coding standard. reviewed by james and steve.
2009-12-02Manual merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2009-12-02fixed normal bug EXT-2738 ([BSI] 12-hour clock format should not have a ↵Paul Guslisty
leading zero) --HG-- branch : product-engine
2009-12-01DEV-43622 : API change (no functionality change) to fix a design error in LLSDKent Quirk
I made it about a year and a half ago; Zero found it while reading code. I had added a return value to LLSD::insert(), but a) did it wrong, and b) broke the STL-like semantics of insert(). So I've put insert() back to returning void and created LLSD::with(), which does what my earlier insert() did. The compiler then caught all the cases where insert()'s return value were being used, and I changed those to use with() instead.
2009-12-01mergeJames Cook
2009-12-01line ending fixesBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-30Linker optimization - use "extern template" for commonly regenerated templatesJames Cook
Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer. Reviewed with Ambroff
2009-11-29Fix for Windows crash (incorrect date format crashes windows)Steve Bennetts
2009-11-29Missed another LL_COMMON_API tagJames Cook
2009-11-28Suppress MSVC warning about extern template for linker optimizationJames Cook
2009-11-28Fix build, missed a file and items need LL_COMMON_APIJames Cook
2009-11-28Fix build - exported globals must have LL_COMMON_API tagJames Cook