summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-08-25merge changes for storm-1268Oz Linden
2011-08-25merge changes for storm-1542Oz Linden
2011-08-25merge changes for storm-1276Oz Linden
2011-08-25merge changes for storm-1571Oz Linden
2011-08-25merge changes for storm-1570Oz Linden
2011-08-24Re-add 3 llinstancetracker tests disabled by changeset 1ead63777bf6.Nat Goodspeed
Fix LLInstanceTracker::key_iter constructor param; accepting InstanceMap::iterator by non-const reference relied on Microsoft extension that accepts non-const reference to an rvalue. Given typical iterator implementation, simply accept by value instead, which makes gcc happy too.
2011-08-23mergeLogan Dethrow
2011-08-23Fixed LLProxy UI constraints. Fixed some XUI warnings in the Proxy Settings ↵Logan Dethrow
Floater.
2011-08-22Fixed a xui widget name mismatch between c++ and xml.Logan Dethrow
2011-08-22merge changes for open-107Oz Linden
2011-08-22increment viewer version to 3.0.3Oz Linden
2011-08-22Added tag 3.0.2-start for changeset f2412ecd6740Oz Linden
2011-08-22adjust build parameters for Snowstorm team buildsOz Linden
2011-08-22STORM-1542 FIXED Changed search URL back from search-beta to search.sl.com.Vadim ProductEngine
2011-08-22merge changes for storm-1554Oz Linden
2011-08-20mergeDave Parks
2011-08-20MergeDave Parks
2011-08-20update BuildParams for Snowstorm Team buildsOz Linden
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-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-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-18fix for SH-2315: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138Xiaohong Bao
2011-08-18Merge.Logan Dethrow
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-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-17take the newlines off of the language.txt filesOz Linden
2011-08-17fix for sh-2307: crash at LLImageGL::setCategory(int) line 1890Xiaohong Bao