summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-09-08SRCH-1623: UNDO EXP--1081Oz Linden
2011-08-29merge changes for .v-pbOz Linden
2011-08-26disabled basic inventory root creationRichard Nelson
reviewed by Stone
2011-08-26EXP-1160 FIX Cannot drag/drop items from inventory into the contents of a ↵Richard Nelson
prim in latest Mesh build 239475 brought back some old logic for dispatching to child folder as drag and drop fallback
2011-08-26merge changes for storm-1568Oz Linden
2011-08-26merge changes for storm-1543Oz Linden
2011-08-26STORM-1543 WIP Removed invalid IOR_BUSY response option.Vadim ProductEngine
Addressing review feedback.
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-23Respect --no-verify-ssl-cert option.Aaron Stone
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-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-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-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-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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 07:36:02 +0000