summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2014-05-16merge fixBrad Payne (Vir Linden)
2014-05-16merge fixBrad Payne (Vir Linden)
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-16Undo of overzealous removal.Aura Linden
2014-04-15maint-5707 window should no longer be displayed.Aura Linden
2014-04-15Disabled 'Sending to server Try N' messages from crash reporting.Aura 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-08revived some deleted files to get mac build workingRichard Linden
2014-04-08mergeBrad Payne (Vir Linden)
2014-04-07fix for build errors...removed duplicate definition of getpid on windowsRichard 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-25Fixed dumb mistake.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-24Old is the new new.Aura 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-21Current log was actually correct.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-14Additions & fixes for lib copy, use only forwarded ptrs in LLAE interfaces.Monty Brandenberg
2014-03-14Update fmodex to 4.44.31. Move DSP descriptor to heap storage.Monty Brandenberg
2014-03-13Probable fix for linux hang.Aura Linden
2014-03-13Merged in viewer-releaseAura Linden
2014-03-12mergeBrad Payne (Vir Linden)
2014-03-12merge with releaseRichard Linden
2014-03-10Merge. Refresh from viewer-release after 3.7.3 release.Monty Brandenberg
2014-03-10Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-10increment viewer version to 3.7.4Oz Linden
2014-03-10MAINT-3703 Suspected thread race crasher in fmodex libraryMonty Brandenberg
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