summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2014-01-13Pull merge from lindenlab/viewer-releasemerov
2014-01-08increment viewer version to 3.6.14Oz Linden
2013-12-11MAINT-3575: remove old exe if found in current install directoryOz Linden
2013-12-11Workaround for MAINT 3099: remove any Vivox log file left in the program folderOz Linden
2013-12-11BUG-4685: remove any SecondLife.exe file left in the SecondLifeViewer folder ↵Oz Linden
by an install prior to 3.12
2013-12-10MAINT-3571: include settings_install.xml whether it contains settings or notOz Linden
2013-12-10Pull merge from lindenlab/viewer-releaseMerov Linden
2013-12-09increment viewer version to 3.6.13Oz Linden
2013-11-27ACME-1221 : Do not clear merchant import cookie on 404, happens to newly ↵Merov Linden
minted merchants
2013-11-26ACME-1220 : Fixed. Do not accumulate callbacks when reinitializing market placeMerov Linden
2013-11-26MAINT-3319 : Fix the purge of descendents of a category. Note: the cached ↵Merov Linden
number of descendents is not always reliable
2013-11-26ACME-3320 : Clearing deleted categories so not to pool on them foreverMerov Linden
2013-11-25MAINT-3320 : Make inbox (Received Items) more resilients to deletion while ↵Merov Linden
we're at it
2013-11-25remove obsolete INSTFLAGS references from installerOz Linden
2013-11-24move setting default grid to settings_install.xml so that it works on all ↵Oz Linden
platforms
2013-11-24normalize format of and add arch to all installer namesOz Linden
2013-11-21Pull merge from lindenlab/viewer-releaseMerov Linden
2013-11-21increment viewer version to 3.6.12Oz Linden
2013-11-19MAINT-2287 : Fix merge errors when merging viewer-releaseMerov Linden
2013-11-19ACME-3319 : Consolidate Merchant Outboxes when several are present into one ↵Merov Linden
in the right place
2013-11-18Pull merge from lindenlab/viewer-releaseMerov Linden
2013-11-18MAINT-3319 : WIP : Introduce a consolidate folder method used for Merchant ↵Merov Linden
Outbox
2013-11-15MAINT-3320 : Fixed! Inventory panels are not resistant to folder root ↵Merov Linden
deletion, using handle instead of pointer and cleaning things consistently
2013-11-13MAINT-3320 : WIP : Introduced a cleanOutbox() method to be called on outbox ↵Merov Linden
deletion
2013-11-11MAINT-3320 : WIP : Use handle for elements that'll get deleted under us, ↵Merov Linden
quite a bit of debug spam to clean later
2013-11-11Merge 3.6.11 for RC-abilityGraham Linden
2013-11-11convert dos line endingsOz Linden
2013-11-11increment viewer version to 3.6.11Oz Linden
2013-11-08MAINT-3412 Fix Intel Iris recognizer to include optional Pro as is reported ↵Graham Linden
with integrated-only graphics on new MBP
2013-11-07DRTVWR-338 Make an inocuous change to get a new build number out of TeamCityDave Parks
2013-11-05MAINT-3376 FIXED Successive llSetTextureAnim calls fail in 3.6.10 (283075) ↵maksymsproductengine
unless a different command (llSleep(0.01), llSay(0,"hello")) is placed between them.: - fix for MAINT-2861 was reverted to resolve this issue;
2013-11-01BUG-4286 add AMD R7/R9 entried to GPU tableGraham Linden
2013-10-28Pull merge from lindenlab/viewer-fbcMerov Linden
2013-10-28ACME-1099 : Fix crash when getting the Facebook cap from a (potentially ↵Merov Linden
null) region
2013-10-28MAINT-3343 FIXED Expand/Collapse message pan only on left click.Mnikolenko ProductEngine
2013-10-25Fix release merge issues (included upstream changes not yet in release from ↵Graham Linden
bear)
2013-10-25MAINT-3356 GPU Table update to support Retina MBP 'Intel Iris OpenGL Engine' ↵Graham Linden
driver id on Mavericks.
2013-10-25Merge 3.6.9 ShareStormGraham Linden
2013-10-23increment viewer version to 3.6.10Oz Linden
2013-10-17Pull merge from viewer-releaseMerov Linden
2013-10-17BUG-4185 : Fix glsl compilation error on MacMerov Linden
2013-10-17Pull merge from oz_linden/336-snowstormMerov Linden
2013-10-16Pull merge from lindenlab/viewer-releaseMerov Linden
2013-10-16Fix merge error in llvoavatarGraham Linden
2013-10-16Merge 3.6.8Graham Linden
2013-10-16Merged 3.6.8-releaseScott Lawrence
2013-10-16Merged 3.6.8-releaseScott Lawrence
2013-10-16increment viewer version to 3.6.9oz@lindenlab.com
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-10-14Pull merge with lindenlab/viewer-bearMerov Linden