summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Expand)Author
2014-04-07Merge downstream codesimon
2014-04-07Merge in viewer-release and version update to 3.7.6simon
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-20Returned Secondlife.log to main directory due to unforeseen LLErrorThread com...Aura Linden
2014-03-19logging cleanup in support of debugging text editor problemsOz Linden
2014-03-13OPEN-209: Corrected all instances of trigraphs in the code.Ricky Curtice
2014-03-13Merged in viewer-releaseAura Linden
2014-03-12merge with releaseRichard Linden
2014-03-10Mergedolphin
2014-03-07Fixes for crash reporter startup race condition, crash reporter CPU use, Seco...Aura Linden
2014-02-18Maint-3135 Discovered apple made this change in 10.6.8 not 10.7.0Aura Linden
2014-01-26Was not using correct name for results of file search.obscurestar
2014-01-14Some cleanup of string to wstring conversion and vice versa.Aura Linden
2013-12-17Mac Fullscreen fix for MAINT-3288 and MAINT-3135Aura Linden
2013-12-05added some comments and changed calls from get_master_thread_recorder()Richard Linden
2013-12-04Removed debugging code.Aura Linden
2013-12-03Creating a cleaner branchAura Linden
2013-11-19SH-4634 FIX Interesting: Viewer crashes when receiving teleport offerRichard Linden
2013-11-11MAINT-3432 FIX Help -> Report Bug should open jira with pre-populated fieldsRichard Linden
2013-11-06merge with releaseRichard Linden
2013-10-25SH-3419 Replace per-object time dilation factor with region-wideAndrew Meadows
2013-10-25Merge with 3.6.9dolphin
2013-10-23moved some common functionality from LLTrace::BlockTimerStatHandle to BlockTimerRichard Linden
2013-10-18removed asserts in order to get testable builds againRichard Linden
2013-10-15renamed TimeBlock to BlockTimerStatHandleRichard Linden
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-10-08merge from viewer-releaseRichard Linden
2013-10-04Pull merge of lindenlab/viewer-releaseMerov Linden
2013-10-04Merge with 3.6.7dolphin
2013-10-03added initial memory usage tracking for lltraceRichard Linden
2013-09-27BUILDFIX: fix for mac buildsRichard Linden
2013-09-16mergeRichard Linden
2013-09-13FIX: SH-4499 Mac generates lots of 'Entering main_loop' log spamRichard Linden
2013-09-09merge with viewer-releaseRichard Linden
2013-09-09Pull from lindenlab/viewer-releaseMerov Linden
2013-09-09Merge viewer-releasesimon
2013-09-09Merge with 3.6.5dolphin
2013-09-07mergeRichard Linden
2013-09-07added memory usage and occlusion events to tracesRichard Linden
2013-09-05changed fast timer over to using macroRichard Linden
2013-08-29add "Settings" logging tag to make debugging settings loading easierOz Linden
2013-08-28merging viewer releaseGilbert Gonzales
2013-08-27Mergedolphin
2013-08-27merge changes for 3.6.4-releaseOz Linden
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-26merge changes for 3.6.4-releaseOz Linden
2013-08-26reversion of object cache version number changeXiaohong Bao