summaryrefslogtreecommitdiff
AgeCommit message (Collapse)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-05-06Added tag 3.7.7-release for changeset 83959480cb98Oz Linden
2014-04-22MergeXiaohong Bao
2014-04-22mergeBrad Payne (Vir Linden)
2014-04-21increment viewer version to 3.7.7Oz Linden
2014-04-21Added tag 3.7.6-release for changeset d029faf69f20Oz 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-07Pulled viewer-vivox4.6 into this branch for future RC.Aura Linden
2014-04-07Merged viewer release into vivoxAura Linden
2014-04-07Pull merge from lindenlab/viewer-releaseMerov Linden
2014-04-07increment viewer version to 3.7.6Oz Linden
2014-04-07Added tag 3.7.5-release for changeset fc066b82343fOz Linden
2014-03-31mergeBrad Payne (Vir Linden)
2014-03-27Pulled merge from releaseAura Linden
2014-03-26Double init of logging probably due to merge fail.Aura Linden
2014-03-26Not ideal but sufficient.Aura Linden
2014-03-25MergedAura Linden
2014-03-25Still wasn't doing the right thing with log files.Aura Linden
2014-03-25It would help to specify the correct destination directory genius.Aura Linden
2014-03-25Fixed dumb mistake.Aura Linden
2014-03-24The simple approach has not worked. This hybrid solution should avoid the ↵Aura Linden
Windows issues and get us per-run logfiles.
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-24Added tag 3.7.4-release for changeset d076568ff788Oz 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 ↵Aura Linden
complexities.
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-14Consistent set of fmodex 4.44.31 builds now.Monty Brandenberg
2014-03-14Additions & fixes for lib copy, use only forwarded ptrs in LLAE interfaces.Monty Brandenberg
Copy3rdPartyLibs needed to copy the now-corrected fmodexL libraries and it had a bad library reference on Linux for release. In llaudio land, the audio engine interfaces, even the fmodex specializations, seem to want to be external-structure free so use a forward declaration and pointer to FMOD_DSP_DESCRIPTION and deal with it in the ctor/dtor.
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