summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Expand)Author
2014-05-16merge fixesBrad Payne (Vir Linden)
2014-05-15fix for bad mergeBrad Payne (Vir Linden)
2014-05-14v-r -> s-e merge WIPBrad Payne (Vir Linden)
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-06increment viewer version to 3.7.8Oz Linden
2014-04-22MergeXiaohong Bao
2014-04-22mergeBrad Payne (Vir Linden)
2014-04-21increment viewer version to 3.7.7Oz Linden
2014-04-15Merges in fix for Maint-5707Aura Linden
2014-04-14Fix for MAINT-5707 bad breakpad behavior with teleport linksAura Linden
2014-04-08mergeBrad Payne (Vir Linden)
2014-04-07merge with releaseRichard Linden
2014-04-07Pull merge from lindenlab/viewer-releaseMerov Linden
2014-04-07increment viewer version to 3.7.6Oz Linden
2014-03-31mergeBrad Payne (Vir Linden)
2014-03-26Double init of logging probably due to merge fail.Aura Linden
2014-03-26Not ideal but sufficient.Aura Linden
2014-03-25Still wasn't doing the right thing with log files.Aura Linden
2014-03-24The simple approach has not worked. This hybrid solution should avoid the Wi...Aura Linden
2014-03-24Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-24merge with releaseRichard Linden
2014-03-24Merged in viewer-release.Aura Linden
2014-03-24increment viewer version to 3.7.5Oz Linden
2014-03-24merge changes for DRTVWR-360Oz Linden
2014-03-24Pulled merge from release.Aura Linden
2014-03-20Returned Secondlife.log to main directory due to unforeseen LLErrorThread com...Aura Linden
2014-03-17ACME-1376 : Take the location checkbox out of the photo panelMerov Linden
2014-03-15Mac Debug build is functional with this manifest changeMonty Brandenberg
2014-03-13Merged in viewer-releaseAura Linden
2014-03-12mergeBrad Payne (Vir Linden)
2014-03-12merge with releaseRichard Linden
2014-03-10Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-10increment viewer version to 3.7.4Oz Linden
2014-03-07Fixes for crash reporter startup race condition, crash reporter CPU use, Seco...Aura Linden
2014-03-05balance the Object cache trees to delete empty nodes to save memory.Xiaohong Bao
2014-03-03[MAINT-3555][MAINT-3703]Baker Linden
2014-02-27Pull merge of codesign workaroundMerov Linden
2014-02-27Merge JJ's viewer-release-codesign-workaroundsimon
2014-02-26fixed mispelling of generateOutgoingAdHocHashRichard Linden
2014-02-26MAINT-3448 FIX: Timestamps disappear from conversation log after viewer restartRichard Linden
2014-02-26Merged lindenlab/viewer-release into defaultJames Johnson
2014-02-25Merge viewer-releasesimon
2014-02-25[MAINT-3784] - Viewer takes too long to shut downBaker Linden
2014-02-25merge viewer-release to sunshine-externalBrad Payne (Vir Linden)
2014-02-24merge with releaseRichard Linden
2014-02-24Pulled from release.obscurestar
2014-02-24Pull merge from viewer-releaseMerov Linden
2014-02-24increment viewer version to 3.7.3Oz Linden
2014-02-24mergeBrad Payne (Vir Linden)
2014-02-21changed variable names and errors to more accurately reflect the operation be...JJ Linden