summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Expand)Author
2009-06-23Removed conflict markers (ie. <<<<<<<) in llmessage/CMakeLists.txtMark Palange (Mani)
2009-06-23Incomplete attempt to clean up Mercurial branch buildNat Goodspeed
2009-06-22Merge with viewer-2.0.0-3 branchBryan O'Sullivan
2009-06-22trivial comment fixes for typos that were bugging me...Adam Moss
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-06-19result of "svn merge -r123757:124890 svn+ssh://svn.lindenlab.com/svn/linden/b...Paul Oppenheim
2009-06-19DEV-31980: extract dispatch-by-string-name logic from LLAresListener to newNat Goodspeed
2009-06-10Added LLAPRSockStream class and associated LLAPRSockStreambuf class forBrad Kittenbrink
2009-06-04Merge of QAR-1383 event-system-7 into trunk.Brad Kittenbrink
2009-06-04DEV-32777: Use a canonical boost::coroutines::coroutine signature, relying onNat Goodspeed
2009-06-03DEV-32777: Introduce LLCoros, an LLSingleton registry of named coroutineNat Goodspeed
2009-05-29Added new LL_COMMON_API dll export declaration for new llsd_equals function.Brad Kittenbrink
2009-05-28DEV-32777: ensure that stack objects listening on persistent LLEventPumps getNat Goodspeed
2009-05-27DEV-31979: Introduce LLReqID, a class to help individual event API listenersNat Goodspeed
2009-05-27Fix minor Mac build breakage (missing #include)Nat Goodspeed
2009-05-27Fix for mac build errors following r121524 commit for DEV-27646.Brad Kittenbrink
2009-05-26Add llsd_equals(), a function whose absence sorely puzzles meNat Goodspeed
2009-05-22DEV-27646 dll linkage for login module.Brad Kittenbrink
2009-05-22svn merge -r121194:121210Adam Moss
2009-05-19Now that 1.27 has branched away, bumping the version number to 1.29 toRobert Knop
2009-05-18Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_da...Aaron Brashears
2009-05-13svn merge -r113003:119136 svn+ssh://svn.lindenlab.com/svn/linden/branches/log...Nat Goodspeed
2009-05-13Any static instance of an STL container introduces static-initializer-orderNat Goodspeed
2009-05-11svn merge -r113003:119136 svn+ssh://svn.lindenlab.com/svn/linden/branches/log...Nat Goodspeed
2009-05-08svn merge -r114679:114681 svn+ssh://svn.lindenlab.com/svn/linden/branches/eve...Nat Goodspeed
2009-05-08merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7Steven Bennetts
2009-05-08Update version to 2.0.0.0 !!!Steven Bennetts
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
2009-04-21svn merge -r117696:117697 svn+ssh://svn.lindenlab.com/svn/linden/branches/fix...Kelly Washington
2009-04-16svn merge -r117314:117337Adam Moss
2009-04-09svn merge -r115000:116937 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-04-01QAR-1284 ip-takedown tools simulator work is ready for mergeAndrew Meadows
2009-03-24Changed LL_VERSION_MINOR to equal 24Debi King
2009-03-20svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Dave Simmons
2009-03-09svn merge -r113780:113785Adam Moss
2009-03-05Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).Eric Tulla
2009-02-25svn merge -r108815:112761 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-02-24Fix another build bogonBryan O'Sullivan
2009-02-24Build fixBryan O'Sullivan
2009-02-24merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunkKelly Washington
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render...Brad Kittenbrink
2009-02-06svn merge -r 108748:109731 svn+ssh://svn.lindenlab.com/svn/linden/branches/se...Robert Knop
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
2009-01-26Now that server 1.26 has frozen and branched away, bump the serverRobert Knop
2009-01-19Merging from the server/server-1.25 branchRobert Knop
2009-01-17svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-ser...Andrew Meadows
2009-01-08svn merge -r104838:107352 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-01-08setting viewer to report 1.23.0, because code in trunk is well beyond 1.22 no...Ramzi Ramey
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2009-01-06Fix for etch build. Q and I both fixed LLDate by adding an operator!=() but ...Andrew Meadows