summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2011-08-22converted tabs to spacesRichard Nelson
2011-08-22Merge with head.callum
2011-08-22Merge with head.callum
2011-08-22STORM-1566 FIXED Sidebar tabs didn't detach by drag-n-drop.Vadim ProductEngine
The regression was introduced in the fix of EXP-856 (changeset 9e650f2750b5).
2011-08-22STORM-1542 FIXED Changed search URL back from search-beta to search.sl.com.Vadim ProductEngine
2011-08-22STORM-1543 WIP More cleanup and comments.Vadim ProductEngine
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-19Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-08-19Removing tabs to satisfy coding policy!Leslie 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-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-18LLProxy: Renamed a setting to better describe what it controls.Logan Dethrow
2011-08-17take the newlines off of the language.txt filesOz Linden
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-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
2011-08-16EXP-1099 FIX Cannot drag item on to empty space in outbox folderRichard Linden
2011-08-16sync with viewer-developmenteli
2011-08-16merge missing changesets for storm-1557Oz Linden