summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-08-24STORM-1572 XML issues for Basic/Advanced Mode button in menu barJonathan Yap
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-23mergeLeyla Farazha
2011-08-23EXP-1068 Disallow marketplace listing of items that are currently being wornLeyla Farazha
2011-08-23mergeLogan Dethrow
2011-08-23Fixed LLProxy UI constraints. Fixed some XUI warnings in the Proxy Settings ↵Logan Dethrow
Floater.
2011-08-23Merge from viewer-experienceLeslie Linden
2011-08-23EXP-1099 FIX Cannot drag item on to empty space in outbox folderRichard Linden
corrected bad logic for resizing LLFolderView
2011-08-23STORM-1567 Mute button for llDialog popupJonathan Yap
Updating patch to current version of viewer-development
2011-08-22Fixed a xui widget name mismatch between c++ and xml.Logan Dethrow
2011-08-22EXP-1129 FIX SLURLs with only 2 coordinates are interpreted as center of simRichard Nelson
reviewed by Leslie
2011-08-22Merge from viewer-experienceLeslie Linden
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-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-19better unit test for nested brackets in string replacementRichard Linden
2011-08-19fix for not properly handling nested brackets inRichard Linden
string replacement, e.g. [[FOO]]
2011-08-19EXP-840 FIX -- Create outbox panels to help the user get started on the ↵Leslie Linden
marketplace and to indicate drag and drop targets. EXP-858 PROGRESS -- Outbox sync failure error handling EXP-908 FIX -- Hide outbox when appropriate EXP-1062 FIX -- Add modal dialog for outbox sync complete EXP-1096 FIX -- Extra space below Received Items panel for an account that does not have a Merchant Account setup, no outbox display EXP-1104 FIX -- User can activate Merchant Outbox synch button when outbox is empty * Added separate class for outbox view to support error tag rendering * Added confirmation for sync complete. * Added different outbox messages for empty outbox, non-merchant and error: merchant but no outbox * Progress on a bunch of other fronts.
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-19Mac build fix: changed "max" to "llmax"Leslie Linden
2011-08-19Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-08-19MergeLeslie 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-18fixing inner inbox drag and dropLeyla Farazha
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-18EXP-1098 User can drag folders into Outbox with more than 3 levels of nested ↵Leyla Farazha
folders EXP-1100 Show tooltips when drag and drop operations are not allowed
2011-08-18mergeRichard Nelson
2011-08-18Automated merge with http://hg.secondlife.com/viewer-developmentRichard Nelson