summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2014-05-20Merge with 3.7.8-releasedolphin
2014-05-07Merge with 3.7.7-releasedolphin
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-04-23Added SEARCH tab to Experience floater for ACME-1420Cho
2014-04-14Merge with 3.7.5-releasedolphin
2014-04-07merge with releaseRichard Linden
2014-04-07Merge in viewer-release and version update to 3.7.6simon
2014-03-18Added a default message handler for experience logs. Currently just forwards thedolphin
notification.
2014-02-24Pulled from release.obscurestar
2014-02-12Merge with 3.7.0dolphin
2014-02-12merge with releaseRichard Linden
2014-02-10Merge downstream code with viewer-releasesimon
2014-02-04Added an experience tab to the region floaterdolphin
2014-01-28Added llFloaterExperiencePicker, mainly for use by region owners.dolphin
2014-01-03merge changes for 3.6.12-releaseOz Linden
2013-12-21MAINT-3587 FIXED settings.xml still references avatarsunited.com for ↵maksymsproductengine
snapshot upload
2013-12-09Pulled viewer-releaseAura Linden
2013-12-09Merge with 3.6.12dolphin
2013-12-09merge with releaseRichard Linden
2013-12-03Creating a cleaner branchAura Linden
2013-11-24normalize format of and add arch to all installer namesOz Linden
2013-11-15STORM-1980 Added a floater displaying a countdown timer.Jonathan Yap
Removed most of the previous changes.
2013-11-11Fixing coding policy errorsdolphin
2013-11-06merge with releaseRichard Linden
2013-10-25Merge with 3.6.9dolphin
2013-10-24SH-4577 WIP Interesting: viewer crashed when clicking a offline Conversation ↵Richard Linden
containing a shared object potential fix by making instance tracker allow key collisions for LLToastNotifyPanel changed assertion macro to use original unpreprocessed source code renamed instance tracker behavior macros to use LL prefix added RestoreCameraPosOnLogin setting to optionally restore old camera positioning behavior
2013-10-08merge from viewer-releaseRichard Linden
2013-10-04Pull merge of lindenlab/viewer-releaseMerov Linden
2013-10-04Merge with 3.6.7dolphin
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-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-21Added new fields to the experience cache.dolphin
Experience profile moved to it's own floater, will probalby be moving again. XP profile displays most data, though the presentation is not final Fixed a bug with the XP selection combobox in the script editor
2013-08-19MergeXiaohong Bao
2013-08-15Move the experience panel to the bottom of the editor floaterdolphin
2013-08-12SH-4399 FIX: Interesting: Texture console MB Bound 0/384 and texture queue ↵Richard Linden
bounces once per second SH-4346 FIX: Interesting: some integer Statistics are displayed as floating point after crossing region boundary made llerrs/infos/etc properly variadic wrt tags LL_INFOS("A", "B", "C") works, for example fixed unit tests remove llsimplestat
2013-08-08Merge with 3.6.2-releasedolphin
2013-08-05Merge downstream code - Vivox releasesimon
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-08-05correct coding standards problemsOz Linden
2013-08-05Pull merge from lindenlab/viewer-releaseMerov Linden
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-07-24merge up to latest snowstorm integration branchOz Linden
2013-07-11Merged in viewer-releaseAura Linden