summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Expand)Author
2009-06-24merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-...Loren Shih
2009-06-24DEV-31980: Extend LLEventDispatcher to handle const as well as non-constNat Goodspeed
2009-06-23A few more merge error fixes.Mark Palange (Mani)
2009-06-23Set correct svn:eol-style native on XML files, converted several files to use...James Cook
2009-06-23Incomplete attempt to clean up Mercurial branch buildNat Goodspeed
2009-06-23Fixed a bunch of missing includes and forward declares. I was trying to benc...James Cook
2009-06-23QAR-1619: fix Linux-only missing #include (Linux-only reference to LLTrans)Nat Goodspeed
2009-06-22Merge with trunkBryan O'Sullivan
2009-06-22Merge with viewer-2.0.0-3 branchBryan O'Sullivan
2009-06-22Merge with SVN trunkBryan O'Sullivan
2009-06-22QAR-1383: convert new uses of Boost.Signals (arriving from other branches) toNat Goodspeed
2009-06-21Modified RecordToChatConsole to not construct LLFloaterChat if it doesn't alr...Steven Bennetts
2009-06-21Fixed a shutdown crash.Steven Bennetts
2009-06-21merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3Steven Bennetts
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-06-20svn merge -r124872:124873Adam Moss
2009-06-19result of "svn merge -r123757:124890 svn+ssh://svn.lindenlab.com/svn/linden/b...Paul Oppenheim
2009-06-11Merge with SVN trunkBryan O'Sullivan
2009-06-04Fix one more license, add indra/newview/tests to exported treeChristian Goetze
2009-06-04Merge of QAR-1383 event-system-7 into trunk.Brad Kittenbrink
2009-05-29Merge with SVN trunkBryan O'Sullivan
2009-05-27DEV-31979: Introduce LLReqID, a class to help individual event API listenersNat Goodspeed
2009-05-22DEV-27646 dll linkage for login module.Brad Kittenbrink
2009-05-22svn merge -r121194:121210Adam Moss
2009-05-20Merge with SVN trunkBryan O'Sullivan
2009-05-20Windows: make dbghelp.dll an installable packageBryan O'Sullivan
2009-05-19Merge with SVN trunkBryan O'Sullivan
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-11Another line ending changeBryan O'Sullivan
2009-05-11Merge with SVN trunkBryan O'Sullivan
2009-05-11Switch the XML file line endings to native.Bryan O'Sullivan
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 skinning-7 -r 119501-119577 -> viewer-2.0.0-1 *NOTE: This overlaps a l...Steven Bennetts
2009-05-08Replaced combo_item with combo_box.item and converted contents labels into la...Steven Bennetts
2009-05-08merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7Steven Bennetts
2009-05-06Merge with SVN trunkBryan O'Sullivan
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
2009-04-21Merge with SVN trunkBryan O'Sullivan
2009-04-16svn merge -r117314:117337Adam Moss
2009-04-15Turn the artwork tree back into a downloaded package, but revision-controlBryan O'Sullivan
2009-04-14Missed a file.Bryan O'Sullivan
2009-04-14Missed a file.Bryan O'Sullivan
2009-04-14Re-add character data.Bryan O'Sullivan
2009-04-14Re-add character data.Bryan O'Sullivan
2009-04-13merge -r116796:116932 svn+ssh://svn.lindenlab.com/svn/linden/branches/http-te...Christian Goetze
2009-04-09This is causing open source build problems - cherrypicked DEV-29644 VWR-12587...Brian McGroarty
2009-04-09svn merge -r115000:116937 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-03-31Move some viewer artwork into a downloadable package.Bryan O'Sullivan