summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-08-20merge changes for .v-rOz Linden
2011-08-20merge back release tagsOz Linden
2011-08-20merge back beta tagsOz Linden
2011-08-20merge changes for storm-1562Oz Linden
2011-08-20merge changes for storm-1041Oz Linden
2011-08-20merge changes for storm-793Oz Linden
2011-08-20merge changes for storm-782Oz Linden
2011-08-20merge changes for storm-1565Oz Linden
2011-08-19open-107: upgrade to complete stub for convex decompositionOz Linden
2011-08-19BUILDFIX fixing unix line endings on two files to pass policy checks.Nyx (Neal Orman)
2011-08-19merging in latest mesh-developmentNyx (Neal Orman)
2011-08-19FIX SH-862 SH-1246 SH-1565 SH-1566 Update render cost algorithmNyx (Neal Orman)
render cost algorithm triangle count is now scaled to be more balanced vs texture/particle count. In addition added factors for light-emitting and media texture primitives. Algorithm should be near "final" at this point.
2011-08-19merge changes for storm-1563Oz Linden
2011-08-19merge changes for storm-1564Oz Linden
2011-08-19correct coding policy problemsOz Linden
2011-08-19mergeDave Parks
2011-08-19mergeDave Parks
2011-08-19fix for SH-1498: crash at LLImageGL::deleteDeadTextures() line 1429Xiaohong Bao
2011-08-19Added tag DRTVWR-81_3.0.1-beta1, 3.0.1-beta1 for changeset 364fd63517fbDebi King (Dessie)
2011-08-19Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-08-19STORM-1543 WIP Minor cleanup.Vadim ProductEngine
2011-08-19STORM-1543 WIP Fixed auto-moving offered inventory items to trash.Vadim ProductEngine
It turned out impossible to properly remove an inventory item from within LLDiscardAgentOffer::done(), because that would lead to nested LLInventoryModel::notifyObservers() calls. Fixed that by deferring removal until the next LLAppViewer::idle() iteration. Also elimiteed duplicated code.
2011-08-19STORM-1543 WIP Fixed dropping nventory offers in busy mode.Vadim ProductEngine
When auto-discarding inventory offers we looked up missing Busy button (i.e. a button having index=3) in the inventory offer notification dialog template. Failure to find the button resulted in ignoring inventory offers. Fixed that by "auto-clicking" the existing Discard button.
2011-08-19mergeBrad Payne (Vir Linden)
2011-08-19STORM-1268 Settings for ignorable dialogs were reset during deferred ↵Vadim ProductEngine
auto-upgrade. Reason: In case of deferred upgrade (i.e. when you select "Later...") the defaults for notifications settings are not loaded, so when the viewer exits after launching the updater, it incorrectly re-saves notifications settings. Fix: Initialize settings earlier, so that viewer picks them up in update mode.
2011-08-18WIP INTL-46 Update translation for Traditional Chineseeli
2011-08-19MergeSeth ProductEngine
2011-08-18merging in latest mesh-developmentNyx (Neal Orman)
2011-08-18BUILDFIX SH-1246 fixed a bug in the ARC computations, and texture cost ↵Nyx (Neal Orman)
computations in build tools Minor bug in ARC display computations, where wrong numbers were being used for child prims Feature enhancement to not double-count textures reused within a linkset.
2011-08-18fix for SH-2315: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138Xiaohong Bao
2011-08-18Merge.Logan Dethrow
2011-08-18mergeDave Parks
2011-08-18mergeBrad Payne (Vir Linden)
2011-08-18mergeRichard Nelson
2011-08-18Automated merge with http://hg.secondlife.com/viewer-developmentRichard Nelson
2011-08-18EXP-1107 FIX Crash in LLFastTimer::NamedTimer::accumulateTimingsRichard Nelson
2011-08-18Backed out revision cbc793dcd3db to disable libcurl verbose logging.Logan Dethrow
2011-08-18LLProxy: Renamed a setting to better describe what it controls.Logan Dethrow
2011-08-18SH-1180 Log which nodes are problematic when loading a .dae with mirrored ↵Dave Parks
meshes and report error.
2011-08-18merged .hgtagsDebi King (Dessie)
2011-08-18merged .hgtagsDebi King (Dessie)
2011-08-18Added tag DRTVWR-74_2.8.3-release, 2.8.3-release for changeset fb85792b84bfDebi King (Dessie)
2011-08-18Automated merge with ↵Richard Nelson
bundle:D:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.uw1uld\ssh__richard@hg.lindenlab.com_richard_viewer-experience_njk05b.hg
2011-08-18Remove ShowAdvancedBuilderOptions, now always enabledBrad Payne (Vir Linden)
2011-08-17take the newlines off of the language.txt filesOz Linden
2011-08-17fix for sh-2307: crash at LLImageGL::setCategory(int) line 1890Xiaohong Bao
2011-08-17fix for SH-1069: [REGRESSION] Sometimes bumpmaps load only partiallyXiaohong Bao
2011-08-17fix for SH-1142: HUD objects do not display bumpmaps when Lighting and ↵Xiaohong Bao
Shadows are enabled.
2011-08-17storm-1562: disable multi-threaded curl to prevent crashOz Linden
2011-08-17SH-2217 Fix for large models not getting properly clampled by importer (odd ↵Dave Parks
that server seems to need 240m limit instead of 256m limit)