summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-22increment viewer version to 3.0.3Oz Linden
2011-08-22merge changes for storm-1554Oz Linden
2011-08-20MergeDave Parks
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-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-19fix for SH-1498: crash at LLImageGL::deleteDeadTextures() line 1429Xiaohong Bao
2011-08-19Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
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-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
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-17add proper license headers to files that did not have themOz Linden
2011-08-17EXP-700 FIX SLPlugin(s) takes high CPU%callum
Reviewed by Richard.
2011-08-17Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Nelson
2011-08-17add proper copyright and license headersOz Linden
2011-08-17fix files that do not end with a newline (warn-on-failure:copyright because ↵Oz Linden
some have both problems...)
2011-08-17convert tabs to spaces where they are forbiddenOz Linden
2011-08-17correct line endingsOz Linden
2011-08-17merge changes for storm-1546Oz Linden
2011-08-17merge changes for storm-1560Oz Linden
2011-08-17STORM-793 FOLLOWUP Escape ITEM_SLURL in translations.Vadim ProductEngine
2011-08-16FIX INTL-66 translation for set26 and basic set5, for 6 languageseli
2011-08-16fix for tooltips on fast timer debug view not always updatingRichard Linden
2011-08-16merge back late beta fixesOz Linden
2011-08-16fix for SH-2023: Brightness Bump maps don't load when shadows are enabledXiaohong Bao
2011-08-16EXP-1100 WIP Show tooltips when drag and drop operations are not allowedRichard Linden
unblock drag and drop tooltips
2011-08-16EXP-1083 FIX Position of Media control and volume are shifted left with ↵Richard Linden
addition of Mode selector in advanced mode
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 19:31:58 +0000