summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2010-12-01Manual fixes for merge-up errors from viewer-development.Loren Shih
2010-12-01Automated merge up from viewer-developmentLoren Shih
2010-11-22Added failing unit test which I believe should exercise CHOP-220 crash.brad kittenbrink
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-15Merge with lindenlab/viewer-developmentKyle Ambroff
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-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-29SH-262 Fix for debug build on windows.Dave Parks
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-21Merge with andrewKyle Ambroff
2010-10-20Automated merge up from viewer-developmentLoren Shih
2010-10-14Updated colladadom.Dave Parks
2010-10-12Pull update from viewer-developmentMerov Linden
2010-10-11Another merge from http://hg.secondlife.com/viewer-developmentAndrew Meadows
2010-10-01disable incremental linking by default as per vir's request.Dave Parks
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
2010-10-13automated mergeRoxie Linden
2010-10-12EVE-47 - Event formatting should appear in "Profile" windowRoxie Linden
EVE-74 - Change in-viewer support for 'notify me' to be maintainable via app slurl EVE-72 - Modify viewer to make the event profile window be an html control This is basically a reworking of the event profile display to remove all in-viewer specific event display rendering, in preparation for richtext descriptions. Most was removal of code.
2010-10-08Created a floater for setting display nameLeyla Farazha
2010-10-02STORM-137 : Build script modif so that Windows build does not rely on ↵Merov Linden
fmod.dll being dropped in the source tree + addition to allow fmod to be found in standalone. Caution: wait an upcoming install.xml commit before pulling if building internaly.
2010-09-30MergeMatthew Breindel (Falcon)
2010-09-30remove a wad of the experimental evil deadcode that I added while hacking.Tofu Linden
2010-09-27MergeLeyla Farazha
2010-09-27mergeDave Parks
2010-09-24merge from viewer-developmentTofu Linden
2010-09-23SH-211 FIX update viewer-mesh branch to use new tcmalloc packageNyx (Neal Orman)
Finished changes to make viewer-mesh make use of tcmalloc on linux. Almost all changes are juggling cmake config files, to make sure that the package is downloaded, installed, moved at the right times, and linked at the right times. Code reviewed by Seraph
2010-09-22mergeRichard Linden
2010-09-22MergeMatthew Breindel (Falcon)
2010-09-22mergeTofu Linden
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-09-21more work towards making textbox-based script dialogs be their own toast type.Tofu Linden
2010-09-20merge.Tofu Linden
2010-09-19Use tcmalloc for windows (gives auto-magical 16-byte alignment whenever ↵Dave Parks
needed, much faster than Visual C++ malloc).
2010-09-16Pull update from viewer-developmentMerov Linden
2010-09-16mergeRichard Linden
2010-09-16MergeLeyla Farazha
2010-09-16STORM-122 FIXED Clean up obsolete floaters and related dead codeAimee Linden
Removed obsolete XUI files: floater_activeim.xml floater_customize.xml floater_device_settings.xml floater_first_time_tip.xml floater_im.xml floater_my_friends.xml floater_outfit_save_as.xml floater_preview_classified.xml floater_preview_event.xml floater_preview_gesture_info.xml floater_preview_gesture_shortcut.xml floater_preview_gesture_steps.xml floater_statistics.xml floater_wearable_save_as.xml panel_audio_device.xml panel_friends.xml panel_groups.xml panel_nearby_chat.xml panel_online_status.xml panel_region_general_layout.xml Killed obsolete LLFloaterVoiceDeviceSettings class, and moved LLPanelVoiceDeviceSettings into its own appropriately named files.
2010-09-16refactored notification template into own header fileRichard Linden