summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
AgeCommit message (Expand)Author
2014-06-17Pull merge from lindenlab/viewer-releaseMerov Linden
2014-06-16merge changes for 3.7.9-releaseOz Linden
2014-06-05MergeRicky Curtice
2014-06-02Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.Stinson Linden
2014-05-19Pull merge from lindenlab/viewer-releaseMerov Linden
2014-05-20MAINT-4009: Ensuring that the cookie store is properly cleaned on app exit.Stinson Linden
2014-05-19mergeBrad Payne (Vir Linden)
2014-05-19Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Stinson Linden
2014-05-14v-r -> s-e merge WIPBrad Payne (Vir Linden)
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-05-07merge changes for 3.7.7-releaseOz Linden
2014-05-06Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile er...Merov Linden
2014-05-06MAINT-4009: Ensuring that the spare browser media source is cleaned up with t...Stinson Linden
2014-03-13OPEN-209: Corrected all instances of trigraphs in the code.Ricky Curtice
2013-12-21MAINT-3587 FIXED settings.xml still references avatarsunited.com for snapshot...maksymsproductengine
2013-12-12Pull merge from lindenlab/viewer-releaseMerov Linden
2013-12-05mergeBrad Payne (Vir Linden)
2013-12-04ACME-1043 : Fixed! Added an argument to force a clean full feature browser wi...Merov Linden
2013-12-04ACME-1043 : WIP : Add an argument to open trusted content with js and other e...Merov Linden
2013-11-19SH-4634 FIX Interesting: Viewer crashes when receiving teleport offerRichard Linden
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-11-06merge with releaseRichard Linden
2013-10-29Merge viewer-release => sunshine-internalDon Kjer
2013-10-15renamed TimeBlock to BlockTimerStatHandleRichard Linden
2013-09-05changed fast timer over to using macroRichard Linden
2013-10-23Merge latest viewer-release with FBCsimon
2013-10-04MAINT-3270 FIXED crash in LLControlCache<unsigned int>::LLControlCache: Contr...maksymsproductengine
2013-08-09second phase summer cleaningRichard Linden
2013-07-25ACME-745 : Fix : Do not oversanitize the logged URLs...Merov Linden
2013-07-19ACME-734 : Fix : Continue to log but just skip the query partsMerov Linden
2013-07-19ACME-734 : Suppress the green https experiment, prevent logging urls when ski...Merov Linden
2013-05-21mergeBrad Payne (Vir Linden)
2013-04-04Renaming HTTP_HEADER_* into HTTP_IN_HEADER_* and HTTP_OUT_HEADER_* to make it...Don Kjer
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-13Large changes to the LLCurl::Responder API, as well as pulling in some change...Don Kjer
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-10-25MAINT-1275 [SECURITY] Web session tokens saved in SecondLife.logKelly Washington
2012-10-10Introduce new LLDir::findSkinnedFilenames() method. Use as needed.Nat Goodspeed
2012-02-09fix for cached controls in media sortingRichard Linden
2012-02-09EXP-1880 WIP Update Media affects framerate even when Media is disabled.Richard Linden
2012-02-03EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local ChatRichard Linden
2011-12-12Merge with latest from viewer-experienceLeslie Linden
2011-12-09Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2011-12-08Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-12-07toned down spammy error message when slplugin isn't workingRichard Linden
2011-12-06Updated to trigger a 'get' to establish marketplace session cookie when outbo...Leslie Linden
2011-12-06merge changes for storm-591Oz Linden
2011-12-05First pass at connecting to the new marketplace APILeslie Linden
2011-12-05Merge with viewer-experienceLeslie Linden