summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2011-01-05Merge with viewer-developmentcallum
2010-12-29merge kdu unit tests (storm-744)Oz Linden
2010-12-22STORM-810 : Auto update and related changes (integration request from team ↵Merov Linden
chopper)
2010-12-22Merge with tip of viewer-developmentcallum
2010-12-22STORM-808 : merge webkit upgrade to Qt v4.7.1Merov Linden
2010-12-21STORM-151 : pull in viewer-developmentMerov Linden
2010-12-21Merge from trunkAndrew A. de Laix
2010-12-20Merge from viewer-development.Monroe Linden
2010-12-17STORM-744 : Add llkdu unit tests, turn on and fix llworldmap unit tests in ↵Merov Linden
newview
2010-12-17Merge from viewer-development post 2.4 releaseMonty Brandenberg
2010-12-09CHOP-265 Fixed up LL_SEND_CRASH_REPORTS usage. Reviewed by Brad.Mark Palange (Mani)
2010-12-09merge from http://hg.secondlife.com/viewer-developmentMonty Brandenberg
2010-12-07merge viewer-development into web-profilesBrad Payne (Vir Linden)
2010-12-02mergeMonroe Linden
2010-12-02mergeMonroe Linden
2010-11-30SOCIAL-311 PARTIAL FIX Media browser has too many oddities to be useful for ↵callum
viewer web apps
2010-11-22Added failing unit test which I believe should exercise CHOP-220 crash.brad kittenbrink
2010-11-20STORM-151 : Fix viewer make so to use the USE_KDU argumentMerov Linden
2010-11-19STORM-151 : Modify llkdu cmake to point explicitely to static libs, simplify ↵Merov Linden
make (in progress, don't pull yet)
2010-11-19Merged latest lindenlab/viewer-development with mani_linden/viewer-developmentbrad kittenbrink
2010-11-19merge fix for STORM-138Oz Linden
2010-11-18Merge with viewer-developmentMark Palange (Mani)
2010-11-16Viewer 2.4 (as of 15 Nov 2010) with llTextBox support merged inJonathan Yap
2010-11-15mergeRichard Linden
2010-11-15Merge with lindenlab/viewer-developmentKyle Ambroff
2010-11-12STORM-151 : Got decompression to work, compression disabled, simplified ↵Merov Linden
llkdu building
2010-11-13STORM-52 FIXED Made it possible to use an external script editor.Vadim ProductEngine
The editor can be specified: * via "ExternalEditor" setting in settings.xml * via LL_SCRIPT_EDITOR variable Removed obsolete XUIEditor setting in favor of the new one.
2010-11-09start of a thread safe queueAndrew A. de Laix
2010-11-08Fix for breakpad symbol files failing to be generated on linux.brad kittenbrink
2010-11-08Fix for linux link errors in teamcity.brad kittenbrink
2010-11-04merge with STORM-105Merov Linden
2010-11-04Turned generate_breakpad_symbols target into a noop for non-Release builds.brad kittenbrink
2010-11-01VWR-23666 Removed setting VersionChannelName. LLVersionInfo::resetChannel() ↵Mark Palange (Mani)
and unit tests. Reviewed by brad.
2010-10-28ESC-109 Write single-thread asset stats collector for wearable.Monty Brandenberg
Code-complete with unit tests and foundation for other collectors. Interestingly, sim and viewer have two different ideas about asset type enumeration (compatible, one's just longer). Both are missing mesh though that's to be expected.
2010-10-27STORM-104 : make kdu statically linked, suppress the need for llkduMerov Linden
2010-10-27CHOP-122 Initializing Facade service in the viewer. Rev. by Brad.Mark Palange (Mani)
2010-10-22Merge with viewer-developmentMerov Linden
2010-10-22ESC-108 Develop support classes for numerical collectionMonty Brandenberg
Stuff moved over and adapted from simulator code. Basic, simple counters and min/max/mean accumulators.
2010-10-21Merge with andrewKyle Ambroff
2010-10-21Added support for map tracking slapp, share slapp and a voice call slapp.prep linden
slapp urls: secondlife:///app/maptrackavatar/lluid secondlife:///app/sharewithavatar/lluid secondlife:///app/voicecallavatar/lluid
2010-10-21Added support for map tracking slapp, share slapp and a voice call slapp.prep linden
slapp urls: secondlife:///app/maptrackavatar/lluid secondlife:///app/sharewithavatar/lluid secondlife:///app/voicecallavatar/lluid
2010-10-21Added support for map tracking slapp, share slapp and a voice call slapp.prep linden
slapp urls: secondlife:///app/maptrackavatar/lluid secondlife:///app/sharewithavatar/lluid secondlife:///app/voicecallavatar/lluid
2010-10-12Pull update from viewer-developmentMerov Linden
2010-10-11Another merge from http://hg.secondlife.com/viewer-developmentAndrew Meadows
2010-10-01Keys.xml replaces keys.ini - fix for CMakecallum
2010-10-15automated mergeRoxie Linden
2010-10-15MergeLeyla Farazha
2010-10-15automated mergeRoxie Linden
2010-10-15automated mergeRoxie Linden
2010-10-15Automated merge with file:///Users/oz/Work/viewer-developmentOz Linden